Correctly handle unknown entity types

ViaVersion · Dec 15, 2024 · 71484d4 · 71484d4
1 parent f2a7c74
commit 71484d4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/...net/raphimc/vialegacy/protocol/release/r1_2_4_5tor1_3_1_2/Protocolr1_2_4_5Tor1_3_1_2.java b/...net/raphimc/vialegacy/protocol/release/r1_2_4_5tor1_3_1_2/Protocolr1_2_4_5Tor1_3_1_2.java
@@ -270,7 +270,9 @@ public void register() {
                         wrapper.write(Types.SHORT, speedZ);
                     }
 
-                    entityTracker.getTrackedEntities().put(entityId, new TrackedEntity(entityId, location, type));
+                    if (type != null) {
+                        entityTracker.getTrackedEntities().put(entityId, new TrackedEntity(entityId, location, type));
+                    }
                     final EntityTypes1_8.ObjectType objectType = EntityTypes1_8.ObjectType.findById(typeId);
                     if (objectType == null) return;
 
@@ -312,6 +314,10 @@ public void register() {
                     final double z = wrapper.get(Types.INT, 3) / 32.0D;
                     final List<EntityData> entityDataList = wrapper.get(Types1_3_1.ENTITY_DATA_LIST, 0);
                     final EntityTypes1_8.EntityType entityType = EntityTypes1_8.getTypeFromId(type, false);
+                    if (entityType == null) {
+                        wrapper.cancel();
+                        return;
+                    }
                     final EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                     tracker.getTrackedEntities().put(entityId, new TrackedLivingEntity(entityId, new Location(x, y, z), entityType));
                     tracker.updateEntityDataList(entityId, entityDataList);

diff --git a/...in/java/net/raphimc/vialegacy/protocol/release/r1_5_2tor1_6_1/Protocolr1_5_2Tor1_6_1.java b/...in/java/net/raphimc/vialegacy/protocol/release/r1_5_2tor1_6_1/Protocolr1_5_2Tor1_6_1.java
@@ -133,7 +133,10 @@ public void register() {
                 handler(wrapper -> {
                     final int entityID = wrapper.get(Types.INT, 0);
                     final int typeID = wrapper.get(Types.BYTE, 0);
-                    wrapper.user().get(EntityTracker.class).getTrackedEntities().put(entityID, EntityTypes1_8.getTypeFromId(typeID, true));
+                    final EntityTypes1_8.EntityType entityType = EntityTypes1_8.getTypeFromId(typeID, true);
+                    if (entityType != null) {
+                        wrapper.user().get(EntityTracker.class).getTrackedEntities().put(entityID, entityType);
+                    }
                 });
             }
         });
@@ -156,6 +159,10 @@ public void register() {
                     final int entityID = wrapper.get(Types.INT, 0);
                     final int typeID = wrapper.get(Types.UNSIGNED_BYTE, 0);
                     final EntityTypes1_8.EntityType entityType = EntityTypes1_8.getTypeFromId(typeID, false);
+                    if (entityType == null) {
+                        wrapper.cancel();
+                        return;
+                    }
                     final List<EntityData> entityDataList = wrapper.get(Types1_6_4.ENTITY_DATA_LIST, 0);
                     wrapper.user().get(EntityTracker.class).getTrackedEntities().put(entityID, entityType);
                     EntityDataRewriter.transform(entityType, entityDataList);

diff --git a/.../java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/Protocolr1_7_6_10Tor1_8.java b/.../java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/Protocolr1_7_6_10Tor1_8.java
@@ -305,6 +305,9 @@ public void register() {
                     byte yaw = wrapper.get(Types.BYTE, 2);
                     int data = wrapper.get(Types.INT, 3);
                     final EntityTypes1_8.EntityType type = EntityTypes1_8.getTypeFromId(typeID, true);
+                    if (type == null) {
+                        return;
+                    }
                     tracker.trackEntity(entityID, type);
                     tracker.updateEntityLocation(entityID, x, y, z, false);
 
@@ -370,6 +373,10 @@ public void register() {
                     final int z = wrapper.get(Types.INT, 2);
                     final List<EntityData> entityDataList = wrapper.get(Types1_8.ENTITY_DATA_LIST, 0);
                     final EntityTypes1_8.EntityType entityType = EntityTypes1_8.getTypeFromId(typeID, false);
+                    if (entityType == null) {
+                        wrapper.cancel();
+                        return;
+                    }
                     tracker.trackEntity(entityID, entityType);
                     tracker.updateEntityLocation(entityID, x, y, z, false);
                     tracker.updateEntityData(entityID, entityDataList);