Skip metadata of entities which aren't spawned (yet)

ViaVersion · Jun 27, 2024 · 43c3bb1 · 43c3bb1
1 parent f57ac05
commit 43c3bb1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/...n/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/data/EntityDataIndex1_7_6_10.java b/...n/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/data/EntityDataIndex1_7_6_10.java
@@ -174,12 +174,8 @@ public enum EntityDataIndex1_7_6_10 {
 	}
 
 	private static Optional<EntityDataIndex1_7_6_10> getIndex(EntityType type, int index) {
-		Pair<EntityType, Integer> pair = new Pair<>(type, index);
-		if (ENTITY_DATA_REWRITES.containsKey(pair)) {
-			return Optional.of(ENTITY_DATA_REWRITES.get(pair));
-		}
-
-		return Optional.empty();
+		final Pair<EntityType, Integer> pair = new Pair<>(type, index);
+		return Optional.ofNullable(ENTITY_DATA_REWRITES.get(pair));
 	}
 
 	public EntityTypes1_8.EntityType getClazz() {
@@ -203,6 +199,10 @@ public int getIndex() {
 	}
 
 	public static EntityDataIndex1_7_6_10 searchIndex(EntityType type, int index) {
+		if (type == null) {
+			// Plugins sending metadata before an entity is spawned, causing exceptions while the game ignores them.
+			return null;
+		}
 		EntityType currentType = type;
 		do {
 			Optional<EntityDataIndex1_7_6_10> optMeta = getIndex(currentType, index);

diff --git a/...on/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/data/EntityDataIndex1_8.java b/...on/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/data/EntityDataIndex1_8.java
@@ -41,6 +41,10 @@ private static Optional<EntityDataIndex1_9> getIndex(final EntityType type, fina
 	}
 
 	public static EntityDataIndex1_9 searchIndex(final EntityType type, final int index) {
+		if (type == null) {
+			// Plugins sending metadata before an entity is spawned, causing exceptions while the game ignores them.
+			return null;
+		}
 		EntityType currentType = type;
 		do {
 			final Optional<EntityDataIndex1_9> optMeta = getIndex(currentType, index);