Merge pull request #1677 from KennyTV/abstraction

20w11a

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

@@ -80,7 +80,7 @@ public class ProtocolVersion {
         register(v1_15 = new ProtocolVersion(573, "1.15"));
         register(v1_15_1 = new ProtocolVersion(575, "1.15.1"));
         register(v1_15_2 = new ProtocolVersion(578, "1.15.2"));
-        register(v1_16 = new ProtocolVersion(705, "1.16"));
+        register(v1_16 = new ProtocolVersion(706, "1.16"));
 
         register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
     }

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java

@@ -32,11 +32,17 @@ public class MetadataRewriter1_16To1_15_2 extends MetadataRewriter {
 
         if (type == null) return;
 
-        if (type.is(Entity1_16Types.EntityType.AREA_EFFECT_CLOUD)) {
+        if (type == Entity1_16Types.EntityType.AREA_EFFECT_CLOUD) {
             if (metadata.getId() == 10) {
                 Particle particle = (Particle) metadata.getValue();
                 particle.setId(WorldPackets.getNewParticleId(particle.getId()));
             }
+        } else if (type.isOrHasParent(Entity1_16Types.EntityType.ABSTRACT_ARROW)) {
+            if (metadata.getId() == 8) {
+                metadatas.remove(metadata);
+            } else if (metadata.getId() > 8) {
+                metadata.setId(metadata.getId() - 1);
+            }
         }
     }