diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 059459fa..dfb52371 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation 'de.tr7zw:item-nbt-api:2.14.2-SNAPSHOT' compileOnly "org.spigotmc:spigot-api:${bukkit_spigot_api}" - compileOnly 'com.github.retrooper.packetevents:spigot:2.3.0' + compileOnly 'com.github.retrooper:packetevents-spigot:2.7.0' compileOnly 'com.comphenix.protocol:ProtocolLib:5.3.0' compileOnly 'org.projectlombok:lombok:1.18.36' compileOnly 'commons-io:commons-io:2.18.0' diff --git a/bukkit/src/main/java/net/william278/husksync/listener/BukkitPacketEventsLockedPacketListener.java b/bukkit/src/main/java/net/william278/husksync/listener/BukkitPacketEventsLockedPacketListener.java index dc66a8c4..8313eeff 100644 --- a/bukkit/src/main/java/net/william278/husksync/listener/BukkitPacketEventsLockedPacketListener.java +++ b/bukkit/src/main/java/net/william278/husksync/listener/BukkitPacketEventsLockedPacketListener.java @@ -43,9 +43,7 @@ public class BukkitPacketEventsLockedPacketListener extends BukkitLockedEventLis public void onLoad() { super.onLoad(); PacketEvents.setAPI(SpigotPacketEventsBuilder.build(getPlugin())); - PacketEvents.getAPI().getSettings().reEncodeByDefault(false) - .checkForUpdates(false) - .bStats(true); + PacketEvents.getAPI().getSettings().reEncodeByDefault(false).checkForUpdates(false).bStats(true); PacketEvents.getAPI().load(); } @@ -61,6 +59,7 @@ public class BukkitPacketEventsLockedPacketListener extends BukkitLockedEventLis private static final Set ALLOWED_PACKETS = Set.of( PacketType.Play.Client.KEEP_ALIVE, PacketType.Play.Client.PONG, PacketType.Play.Client.PLUGIN_MESSAGE, // Connection packets + PacketType.Play.Client.PLAYER_LOADED, PacketType.Play.Client.CLIENT_TICK_END, // Connection packets PacketType.Play.Client.CHAT_MESSAGE, PacketType.Play.Client.CHAT_COMMAND, PacketType.Play.Client.CHAT_SESSION_UPDATE, // Chat / command packets PacketType.Play.Client.PLAYER_POSITION, PacketType.Play.Client.PLAYER_POSITION_AND_ROTATION, PacketType.Play.Client.PLAYER_ROTATION, // Movement packets PacketType.Play.Client.HELD_ITEM_CHANGE, PacketType.Play.Client.ANIMATION, PacketType.Play.Client.TELEPORT_CONFIRM, // Animation packets diff --git a/bukkit/src/main/java/net/william278/husksync/listener/BukkitProtocolLibLockedPacketListener.java b/bukkit/src/main/java/net/william278/husksync/listener/BukkitProtocolLibLockedPacketListener.java index eac661b0..5b1d6737 100644 --- a/bukkit/src/main/java/net/william278/husksync/listener/BukkitProtocolLibLockedPacketListener.java +++ b/bukkit/src/main/java/net/william278/husksync/listener/BukkitProtocolLibLockedPacketListener.java @@ -49,7 +49,7 @@ public class BukkitProtocolLibLockedPacketListener extends BukkitLockedEventList private static class PlayerPacketAdapter extends PacketAdapter { - // Packets we want the player to still be able to send/receiver to/from the server + // Packets we want the player to still be able to send/receiver to/from the server - //todo update 1.21.4 private static final Set ALLOWED_PACKETS = Set.of( Client.KEEP_ALIVE, Client.PONG, Client.CUSTOM_PAYLOAD, // Connection packets Client.CHAT_COMMAND, Client.CLIENT_COMMAND, Client.CHAT, Client.CHAT_SESSION_UPDATE, // Chat / command packets