merge dev

common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java

@@ -77,7 +77,7 @@ public class ProtocolVersion {
         register(v1_14_2 = new ProtocolVersion(485, "1.14.2"));
         register(v1_14_3 = new ProtocolVersion(490, "1.14.3"));
         register(v1_14_4 = new ProtocolVersion(498, "1.14.4"));
-        register(v1_15 = new ProtocolVersion(560, "1.15"));
+        register(v1_15 = new ProtocolVersion(564, "1.15"));
         register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
     }
 

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java

@@ -37,7 +37,17 @@ public class MetadataRewriter1_15To1_14_4 extends MetadataRewriter {
             metadata.setId(metadata.getId() + 1); //TODO is it 11 or 12? what is it for?
         }
 
-        //TODO new boolean with id 17 for enderman
+        //NOTES:
+        //new boolean with id 11 for trident, default = false, added in 19w45a
+        //new boolean with id 17 for enderman
+
+        if (type.isOrHasParent(Entity1_15Types.EntityType.WOLF)) {
+            if (metadata.getId() == 18) {
+                metadatas.remove(metadata);
+            } else if (metadata.getId() > 18) {
+                metadata.setId(metadata.getId() - 1);
+            }
+        }
     }
 
     @Override

common/src/main/resources/assets/viaversion/data/mapping-1.15.json

@@ -13373,7 +13373,6 @@
     "entity.parrot.imitate.drowned",
     "entity.parrot.imitate.elder_guardian",
     "entity.parrot.imitate.ender_dragon",
-    "entity.parrot.imitate.enderman",
     "entity.parrot.imitate.endermite",
     "entity.parrot.imitate.evoker",
     "entity.parrot.imitate.ghast",