Fixed: #10, where when enabling the players only option, nothing was …

…being spoofed.
Bram1903 · Jun 7, 2024 · 4965908 · 4965908
1 parent 5db0d49
commit 4965908
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/common/src/main/java/com/deathmotion/antihealthindicator/packetlisteners/EntityTracker.java b/common/src/main/java/com/deathmotion/antihealthindicator/packetlisteners/EntityTracker.java
@@ -68,8 +68,14 @@ public EntityTracker(AHIPlatform<P> platform) {
     public void onPacketSend(PacketSendEvent event) {
         final PacketTypeCommon type = event.getPacketType();
 
-        if (PacketType.Play.Server.SPAWN_PLAYER == type) {
+        if (PacketType.Play.Server.SPAWN_LIVING_ENTITY == type) {
+            handleSpawnLivingEntity(new WrapperPlayServerSpawnLivingEntity(event), event.getUser());
+        } else if (PacketType.Play.Server.SPAWN_ENTITY == type) {
+            handleSpawnEntity(new WrapperPlayServerSpawnEntity(event), event.getUser());
+        } else if (PacketType.Play.Server.SPAWN_PLAYER == type) {
             handleSpawnPlayer(new WrapperPlayServerSpawnPlayer(event), event.getUser());
+        } else if (PacketType.Play.Server.ENTITY_METADATA == type) {
+            handleEntityMetadata(new WrapperPlayServerEntityMetadata(event), event.getUser());
         } else if (PacketType.Play.Server.DESTROY_ENTITIES == type) {
             handleDestroyEntities(new WrapperPlayServerDestroyEntities(event), event.getUser());
         } else if (PacketType.Play.Server.RESPAWN == type) {
@@ -79,16 +85,6 @@ public void onPacketSend(PacketSendEvent event) {
         } else if (PacketType.Play.Server.CONFIGURATION_START == type) {
             handleConfigurationStart(event.getUser());
         }
-
-        if (!settings.getEntityData().isPlayersOnly()) {
-            if (PacketType.Play.Server.SPAWN_LIVING_ENTITY == type) {
-                handleSpawnLivingEntity(new WrapperPlayServerSpawnLivingEntity(event), event.getUser());
-            } else if (PacketType.Play.Server.SPAWN_ENTITY == type) {
-                handleSpawnEntity(new WrapperPlayServerSpawnEntity(event), event.getUser());
-            } else if (PacketType.Play.Server.ENTITY_METADATA == type) {
-                handleEntityMetadata(new WrapperPlayServerEntityMetadata(event), event.getUser());
-            }
-        }
     }
 
     @Override
@@ -100,9 +96,14 @@ public void onUserDisconnect(UserDisconnectEvent event) {
     }
 
     private void handleSpawnLivingEntity(WrapperPlayServerSpawnLivingEntity packet, User user) {
-        int entityId = packet.getEntityId();
         EntityType entityType = packet.getEntityType();
 
+        if (settings.getEntityData().isPlayersOnly()) {
+            if (!EntityTypes.isTypeInstanceOf(entityType, EntityTypes.PLAYER)) return;
+        }
+
+        int entityId = packet.getEntityId();
+
         CachedEntity entityData = createLivingEntity(entityType);
         cacheManager.addLivingEntity(user.getUUID(), entityId, entityData);
     }
@@ -111,6 +112,10 @@ private void handleSpawnEntity(WrapperPlayServerSpawnEntity packet, User user) {
         EntityType entityType = packet.getEntityType();
 
         if (EntityTypes.isTypeInstanceOf(entityType, EntityTypes.LIVINGENTITY)) {
+            if (settings.getEntityData().isPlayersOnly()) {
+                if (!EntityTypes.isTypeInstanceOf(entityType, EntityTypes.PLAYER)) return;
+            }
+
             int entityId = packet.getEntityId();
 
             CachedEntity entityData = createLivingEntity(entityType);
@@ -126,6 +131,8 @@ private void handleSpawnPlayer(WrapperPlayServerSpawnPlayer packet, User user) {
     }
 
     private void handleEntityMetadata(WrapperPlayServerEntityMetadata packet, User user) {
+        if (settings.getEntityData().isPlayersOnly()) return;
+
         int entityId = packet.getEntityId();
 
         CachedEntity entityData = cacheManager.getCachedEntity(user.getUUID(), entityId).orElse(null);