From a68f400b6eacf9bf7d6a12c14aa904a26082ce0e Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Thu, 16 Dec 2021 00:11:56 +0100
Subject: [PATCH] Removed the 'should encrypt' argument from the 'packet'
 plugin message

---
 .../org/geysermc/floodgate/api/unsafe/Unsafe.java   | 13 ++-----------
 .../geysermc/floodgate/api/UnsafeFloodgateApi.java  |  8 ++++----
 .../pluginmessage/channel/PacketChannel.java        |  9 ++-------
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/api/src/main/java/org/geysermc/floodgate/api/unsafe/Unsafe.java b/api/src/main/java/org/geysermc/floodgate/api/unsafe/Unsafe.java
index 519d2cde..7e209c26 100644
--- a/api/src/main/java/org/geysermc/floodgate/api/unsafe/Unsafe.java
+++ b/api/src/main/java/org/geysermc/floodgate/api/unsafe/Unsafe.java
@@ -29,15 +29,6 @@ import java.util.UUID;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
 
 public interface Unsafe {
-    void sendPacket(UUID bedrockPlayer, byte[] packetData, boolean encrypt);
-
-    default void sendPacket(UUID bedrockPlayer, byte[] packetData) {
-        sendPacket(bedrockPlayer, packetData, true);
-    }
-
-    void sendPacket(FloodgatePlayer player, byte[] packetData, boolean encrypt);
-
-    default void sendPacket(FloodgatePlayer player, byte[] packetData) {
-        sendPacket(player, packetData, true);
-    }
+    void sendPacket(UUID bedrockPlayer, byte[] packetData);
+    void sendPacket(FloodgatePlayer player, byte[] packetData);
 }
diff --git a/core/src/main/java/org/geysermc/floodgate/api/UnsafeFloodgateApi.java b/core/src/main/java/org/geysermc/floodgate/api/UnsafeFloodgateApi.java
index a54ebd97..25754300 100644
--- a/core/src/main/java/org/geysermc/floodgate/api/UnsafeFloodgateApi.java
+++ b/core/src/main/java/org/geysermc/floodgate/api/UnsafeFloodgateApi.java
@@ -44,12 +44,12 @@ public final class UnsafeFloodgateApi implements Unsafe {
     }
 
     @Override
-    public void sendPacket(UUID bedrockPlayer, byte[] packetData, boolean encrypt) {
-        packetChannel.sendPacket(bedrockPlayer, packetData, encrypt, this);
+    public void sendPacket(UUID bedrockPlayer, byte[] packetData) {
+        packetChannel.sendPacket(bedrockPlayer, packetData, this);
     }
 
     @Override
-    public void sendPacket(FloodgatePlayer player, byte[] packetData, boolean encrypt) {
-        sendPacket(player.getCorrectUniqueId(), packetData, encrypt);
+    public void sendPacket(FloodgatePlayer player, byte[] packetData) {
+        sendPacket(player.getCorrectUniqueId(), packetData);
     }
 }
diff --git a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/PacketChannel.java b/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/PacketChannel.java
index 8b97cd46..fbcc0004 100644
--- a/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/PacketChannel.java
+++ b/core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/PacketChannel.java
@@ -60,15 +60,10 @@ public final class PacketChannel implements PluginMessageChannel {
         return Result.kick("Cannot send packets from Geyser/Floodgate to Floodgate");
     }
 
-    public boolean sendPacket(UUID player, byte[] packet, boolean encrypt, UnsafeFloodgateApi api) {
+    public boolean sendPacket(UUID player, byte[] packet, UnsafeFloodgateApi api) {
         if (api == null) {
             throw new IllegalArgumentException("Can only send a packet using the unsafe api");
         }
-
-        byte[] finalData = new byte[packet.length + 1];
-        finalData[0] = (byte) (encrypt ? 1 : 0);
-        System.arraycopy(packet, 0, finalData, 1, packet.length);
-
-        return pluginMessageUtils.sendMessage(player, getIdentifier(), finalData);
+        return pluginMessageUtils.sendMessage(player, getIdentifier(), packet);
     }
 }