Repo-Mirror/HuskSync
9
0
Fork 0
mirror of https://github.com/WiIIiam278/HuskSync.git synced 2026-01-06 15:41:56 +00:00
Code Issues Releases 1 Activity

fix: missing ALLOWED_PACKETS calling desync

Browse Source
This commit is contained in:
William
2024-04-10 17:54:33 +01:00
parent a03d540938
commit 2b4c7e6c3d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/net/william278/husksync/listener/BukkitLockedEventListener.java
View File

@@ -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());
}
}

9
bukkit/src/main/java/net/william278/husksync/listener/BukkitLockedPacketListener.java
View File

@@ -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<PacketType> 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());
}
}