Null check entity type in LegacyEntityRewriter#getObjectTrackerHandler

ViaVersion · Dec 16, 2024 · a3ec8c8 · a3ec8c8
1 parent e0430c0
commit a3ec8c8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriter.java
@@ -140,6 +140,7 @@ protected EntityType trackAndMapEntity(PacketWrapper wrapper) {
         if (entityType == null) {
             return null;
         }
+
         tracker(wrapper.user()).addEntity(wrapper.get(Types.VAR_INT, 0), entityType);
 
         int mappedTypeId = newEntityId(entityType.getId());

diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java
@@ -124,7 +124,14 @@ public PacketHandler getMobSpawnRewriter1_11(Type<List<EntityData>> dataType) {
     }
 
     protected PacketHandler getObjectTrackerHandler() {
-        return wrapper -> addTrackedEntity(wrapper, wrapper.get(Types.VAR_INT, 0), objectTypeFromId(wrapper.get(Types.BYTE, 0)));
+        return wrapper -> {
+            EntityType type = objectTypeFromId(wrapper.get(Types.BYTE, 0));
+            if (type == null) {
+                return;
+            }
+
+            addTrackedEntity(wrapper, wrapper.get(Types.VAR_INT, 0), type);
+        };
     }
 
     protected PacketHandler getTrackerAndDataHandler(Type<List<EntityData>> dataType, EntityType entityType) {

diff --git a/...com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/EntityPacketRewriter1_13.java b/...com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/EntityPacketRewriter1_13.java
@@ -138,6 +138,7 @@ public void register() {
                     if (entityType == null) {
                         return;
                     }
+
                     tracker(wrapper.user()).addEntity(wrapper.get(Types.VAR_INT, 0), entityType);
 
                     int oldId = EntityIdMappings1_12_2.getOldId(type);
-Original file line number
+Diff line change
@@ Expand Up / @@ -138,6 +138,7 @@ public void register() { @@
                         if (entityType == null) {
                             return;
                         }
                         tracker(wrapper.user()).addEntity(wrapper.get(Types.VAR_INT, 0), entityType);
                         int oldId = EntityIdMappings1_12_2.getOldId(type);
@@ Expand Down @@