Merge pull request #1221 from Gerrygames/1.14

19w12a

bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w11a</version>
+        <version>2.0.0-19w12a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w11a</version>
+        <version>2.0.0-19w12a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w11a</version>
+        <version>2.0.0-19w12a</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

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

@@ -67,7 +67,7 @@ public class ProtocolVersion {
         register(v1_13 = new ProtocolVersion(393, "1.13"));
         register(v1_13_1 = new ProtocolVersion(401, "1.13.1"));
         register(v1_13_2 = new ProtocolVersion(404, "1.13.2"));
-        register(v1_14 = new ProtocolVersion(464, "1.14"));
+        register(v1_14 = new ProtocolVersion(466, "1.14"));
         register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
     }
 

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/MetadataRewriter.java

@@ -23,7 +23,7 @@ public class MetadataRewriter {
                 metadata.setMetaType(MetaType1_14.byId(metadata.getMetaType().getTypeID()));
 
                 EntityTracker tracker = connection.get(EntityTracker.class);
-                // 1.13 changed item to flat item (no data)
+
                 if (metadata.getMetaType() == MetaType1_14.Slot) {
                     InventoryPackets.toClient((Item) metadata.getValue());
                 } else if (metadata.getMetaType() == MetaType1_14.BlockID) {
@@ -100,6 +100,26 @@ public class MetadataRewriter {
                         metadata.setMetaType(MetaType1_14.OptVarInt);
                     }
                 }
+
+                if (type.isOrHasParent(Entity1_14Types.EntityType.ABSTRACT_SKELETON)) {
+                    if (metadata.getId() == 12) {
+                        metadatas.remove(metadata);  // TODO "Is swinging arms", maybe moved to pos / entity status
+                    }
+                }
+
+                if (type.isOrHasParent(Entity1_14Types.EntityType.ZOMBIE)) {
+                    if (metadata.getId() == 16) {
+                        metadatas.remove(metadata);  // TODO "Are hands held up", maybe moved to pos / entity status
+                    } else if (metadata.getId() > 16) {
+                        metadata.setId(metadata.getId() - 1);
+                    }
+                }
+
+                if (type.isOrHasParent(Entity1_14Types.EntityType.ABSTRACT_ILLAGER_BASE)) {
+                    if (metadata.getId() == 14) {
+                        metadatas.remove(metadata);  // TODO "Has target (aggressive state)", maybe moved to pos / entity status
+                    }
+                }
             } catch (Exception e) {
                 metadatas.remove(metadata);
                 if (!Via.getConfig().isSuppressMetadataErrors() || Via.getManager().isDebug()) {

jar/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w11a</version>
+        <version>2.0.0-19w12a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>viaversion-jar</name>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>viaversion-parent</artifactId>
-    <version>2.0.0-19w11a</version>
+    <version>2.0.0-19w12a</version>
     <packaging>pom</packaging>
 
     <name>viaversion-parent</name>

sponge-legacy/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w11a</version>
+        <version>2.0.0-19w12a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sponge/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w11a</version>
+        <version>2.0.0-19w12a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

velocity/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w11a</version>
+        <version>2.0.0-19w12a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>