diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java index 8e4e2006..48b65bce 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java @@ -52,7 +52,6 @@ public abstract class EntityRewriterBase extends En private final MetaType displayVisibilityMetaType; private final int displayNameIndex; private final int displayVisibilityIndex; - protected boolean allowNullEntityType; EntityRewriterBase(T protocol, MetaType displayNameMetaType, int displayNameIndex, MetaType displayVisibilityMetaType, int displayVisibilityIndex) { @@ -65,13 +64,9 @@ public abstract class EntityRewriterBase extends En @Override public void handleMetadata(int entityId, List metadataList, UserConnection connection) { - EntityType type = tracker(connection).entityType(entityId); - if (type == null && !allowNullEntityType) { - return; - } - super.handleMetadata(entityId, metadataList, connection); + EntityType type = tracker(connection).entityType(entityId); if (type == null) { return; // Don't handle untracked entities - basically always the fault of a plugin sending virtual entities through concurrency-unsafe handling } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java index e959b47c..7e219774 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java @@ -38,7 +38,6 @@ public final class EntityPackets1_18 extends EntityRewriter