From aabd79e6c7e190127f01870f74ff14fd7676a205 Mon Sep 17 00:00:00 2001 From: Myles Date: Tue, 1 Mar 2016 10:50:21 +0000 Subject: [PATCH] Force entity meta data remapper to check all non living entity metadata first. (Fixes ArmorStands) --- src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java b/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java index 1655bc30d..fbc1763aa 100644 --- a/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java +++ b/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java @@ -177,8 +177,11 @@ public enum MetaIndex { } for (MetaIndex mi : MetaIndex.values()) { if (mi.getIndex() == index) { - if (mi.getApplicableClass().isAssignableFrom(entityClass) || - mi.getApplicableClass().equals(entityClass)) { + // To fix issue with armour stands colliding with new values + if(mi.getApplicableClass().equals(LivingEntity.class)) continue; + + if ((mi.getApplicableClass().isAssignableFrom(entityClass) || + mi.getApplicableClass().equals(entityClass))) { return mi; } }