diff --git a/bukkit/src/main/java/net/william278/husksync/listener/BukkitLockedEventListener.java b/bukkit/src/main/java/net/william278/husksync/listener/BukkitLockedEventListener.java index 948175df..ae8f79d2 100644 --- a/bukkit/src/main/java/net/william278/husksync/listener/BukkitLockedEventListener.java +++ b/bukkit/src/main/java/net/william278/husksync/listener/BukkitLockedEventListener.java @@ -40,6 +40,7 @@ import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.jetbrains.annotations.NotNull; +import java.util.Objects; import java.util.UUID; @Getter @@ -119,6 +120,7 @@ public class BukkitLockedEventListener implements LockedHandler, Listener { private void cancelPlayerEvent(@NotNull UUID uuid, @NotNull Cancellable event) { if (cancelPlayerEvent(uuid)) { event.setCancelled(true); + plugin.debug("Cancelled event " + event.getClass().getSimpleName() + " from " + Objects.requireNonNull(plugin.getServer().getPlayer(uuid)).getName()); } } diff --git a/bukkit/src/main/java/net/william278/husksync/listener/BukkitLockedPacketListener.java b/bukkit/src/main/java/net/william278/husksync/listener/BukkitLockedPacketListener.java index 3449e000..31fb18e6 100644 --- a/bukkit/src/main/java/net/william278/husksync/listener/BukkitLockedPacketListener.java +++ b/bukkit/src/main/java/net/william278/husksync/listener/BukkitLockedPacketListener.java @@ -46,9 +46,10 @@ public class BukkitLockedPacketListener extends BukkitLockedEventListener implem // Packets we want the player to still be able to send/receiver to/from the server private static final Set ALLOWED_PACKETS = Set.of( - Client.KEEP_ALIVE, Client.PONG, // Connection packets - Client.CHAT_COMMAND, Client.CHAT, Client.CHAT_SESSION_UPDATE, // Chat / command packets - Client.POSITION, Client.POSITION_LOOK, Client.LOOK + 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 + Client.POSITION, Client.POSITION_LOOK, Client.LOOK, // Movement packets + Client.HELD_ITEM_SLOT, Client.ARM_ANIMATION, Client.TELEPORT_ACCEPT // Animation packets ); private final BukkitLockedPacketListener listener; @@ -62,6 +63,7 @@ public class BukkitLockedPacketListener extends BukkitLockedEventListener implem public void onPacketReceiving(@NotNull PacketEvent event) { if (listener.cancelPlayerEvent(event.getPlayer().getUniqueId()) && !event.isReadOnly()) { event.setCancelled(true); + listener.getPlugin().debug("Cancelled receive packet " + event.getPacketType() + " from " + event.getPlayer().getName()); } } @@ -69,6 +71,7 @@ public class BukkitLockedPacketListener extends BukkitLockedEventListener implem public void onPacketSending(PacketEvent event) { if (listener.cancelPlayerEvent(event.getPlayer().getUniqueId()) && !event.isReadOnly()) { event.setCancelled(true); + listener.getPlugin().debug("Cancelled send packet " + event.getPacketType() + " to " + event.getPlayer().getName()); } }