GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00
Code Issues Releases Activity

Removed the 'should encrypt' argument from the 'packet' plugin message

Browse Source
This commit is contained in:
Tim203
2021-12-16 00:11:56 +01:00
parent bf9faad89c
commit a68f400b6e
3 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/src/main/java/org/geysermc/floodgate/api/unsafe/Unsafe.java
View File

@@ -29,15 +29,6 @@ import java.util.UUID;
import org.geysermc.floodgate.api.player.FloodgatePlayer; import org.geysermc.floodgate.api.player.FloodgatePlayer;
public interface Unsafe { public interface Unsafe {
void sendPacket(UUID bedrockPlayer, byte[] packetData, boolean encrypt); void sendPacket(UUID bedrockPlayer, byte[] packetData);
void sendPacket(FloodgatePlayer player, byte[] packetData);
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);
}
} }

8
core/src/main/java/org/geysermc/floodgate/api/UnsafeFloodgateApi.java
View File

@@ -44,12 +44,12 @@ public final class UnsafeFloodgateApi implements Unsafe {
} }
@Override @Override
public void sendPacket(UUID bedrockPlayer, byte[] packetData, boolean encrypt) { public void sendPacket(UUID bedrockPlayer, byte[] packetData) {
packetChannel.sendPacket(bedrockPlayer, packetData, encrypt, this); packetChannel.sendPacket(bedrockPlayer, packetData, this);
} }
@Override @Override
public void sendPacket(FloodgatePlayer player, byte[] packetData, boolean encrypt) { public void sendPacket(FloodgatePlayer player, byte[] packetData) {
sendPacket(player.getCorrectUniqueId(), packetData, encrypt); sendPacket(player.getCorrectUniqueId(), packetData);
} }
} }

9
core/src/main/java/org/geysermc/floodgate/pluginmessage/channel/PacketChannel.java
View File

@@ -60,15 +60,10 @@ public final class PacketChannel implements PluginMessageChannel {
return Result.kick("Cannot send packets from Geyser/Floodgate to Floodgate"); 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) { if (api == null) {
throw new IllegalArgumentException("Can only send a packet using the unsafe api"); throw new IllegalArgumentException("Can only send a packet using the unsafe api");
} }
return pluginMessageUtils.sendMessage(player, getIdentifier(), packet);
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);
} }
} }