diff --git a/build-number.txt b/build-number.txt index dba60802..90c86a92 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -2024 \ No newline at end of file +2028 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/Bot.java b/src/main/java/me/chayapak1/chomens_bot/Bot.java index d261801c..80ce4a8a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Bot.java +++ b/src/main/java/me/chayapak1/chomens_bot/Bot.java @@ -200,7 +200,7 @@ public class Bot extends SessionAdapter { } @Override - public void packetReceived(Session session, Packet packet) { + public void packetReceived (Session session, Packet packet) { for (SessionListener listener : listeners) { try { listener.packetReceived(session, packet); diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java index 8a2e1f17..8499bfb0 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java @@ -8,6 +8,7 @@ import org.cloudburstmc.math.vector.Vector3d; import org.cloudburstmc.math.vector.Vector3f; import org.geysermc.mcprotocollib.network.Session; import org.geysermc.mcprotocollib.network.packet.Packet; +import org.geysermc.mcprotocollib.protocol.data.game.entity.type.EntityType; import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityPosPacket; import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityPosRotPacket; import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityRotPacket; @@ -66,11 +67,11 @@ public class PositionPlugin extends Bot.Listener { @Override public void packetReceived (Session session, Packet packet) { if (packet instanceof ClientboundPlayerPositionPacket) packetReceived((ClientboundPlayerPositionPacket) packet); + else if (packet instanceof ClientboundAddEntityPacket) packetReceived((ClientboundAddEntityPacket) packet); + else if (packet instanceof ClientboundRemoveEntitiesPacket) packetReceived((ClientboundRemoveEntitiesPacket) packet); else if (packet instanceof ClientboundMoveEntityRotPacket) packetReceived((ClientboundMoveEntityRotPacket) packet); else if (packet instanceof ClientboundMoveEntityPosPacket) packetReceived((ClientboundMoveEntityPosPacket) packet); else if (packet instanceof ClientboundMoveEntityPosRotPacket) packetReceived((ClientboundMoveEntityPosRotPacket) packet); - else if (packet instanceof ClientboundAddEntityPacket) packetReceived((ClientboundAddEntityPacket) packet); - else if (packet instanceof ClientboundRemoveEntitiesPacket) packetReceived((ClientboundRemoveEntitiesPacket) packet); } public void packetReceived (ClientboundPlayerPositionPacket packet) { @@ -82,6 +83,8 @@ public class PositionPlugin extends Bot.Listener { } public void packetReceived (ClientboundAddEntityPacket packet) { + if (packet.getType() != EntityType.PLAYER) return; + final PlayerEntry entry = bot.players.getEntry(packet.getUuid()); if (entry == null) return; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java index b2dec206..cc5efd20 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java @@ -39,14 +39,14 @@ public class WorldPlugin extends Bot.Listener { @Override public void packetReceived(Session session, Packet packet) { - if (packet instanceof ClientboundLoginPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundRespawnPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundRegistryDataPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundSetSimulationDistancePacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundLevelChunkWithLightPacket t_packet) packetReceived(t_packet); + if (packet instanceof ClientboundLevelChunkWithLightPacket t_packet) packetReceived(t_packet); else if (packet instanceof ClientboundForgetLevelChunkPacket t_packet) packetReceived(t_packet); else if (packet instanceof ClientboundBlockUpdatePacket t_packet) packetReceived(t_packet); else if (packet instanceof ClientboundSectionBlocksUpdatePacket t_packet) packetReceived(t_packet); + else if (packet instanceof ClientboundLoginPacket t_packet) packetReceived(t_packet); + else if (packet instanceof ClientboundRespawnPacket t_packet) packetReceived(t_packet); + else if (packet instanceof ClientboundRegistryDataPacket t_packet) packetReceived(t_packet); + else if (packet instanceof ClientboundSetSimulationDistancePacket t_packet) packetReceived(t_packet); } @Override