Cleanup

Author: florianreuth

src/main/java/net/raphimc/vialegacy/protocol/release/r1_2_4_5tor1_3_1_2/Protocolr1_2_4_5Tor1_3_1_2.java

@@ -234,7 +234,7 @@ public void register() {
                     final EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
                     final int entityId = wrapper.get(Types.INT, 0);
                     final byte typeId = wrapper.get(Types.BYTE, 0);
-                    final int data = wrapper.get(Types.INT, 1);
+                    final int data = wrapper.get(Types.INT, 4);
                     final EntityTypes1_8.EntityType type;
                     if (typeId == 70 || typeId == 71 || typeId == 74) {
                         type = EntityTypes1_8.ObjectType.FALLING_BLOCK.getType();

src/main/java/net/raphimc/vialegacy/protocol/release/r1_6_4tor1_7_2_5/Protocolr1_6_4Tor1_7_2_5.java

@@ -314,8 +314,9 @@ public void register() {
                 map(Types.BYTE); // yaw
                 map(Types.INT); // data
                 handler(wrapper -> {
+                    final int typeID = wrapper.get(Types.BYTE, 0);
                     int data = wrapper.get(Types.INT, 3);
-                    if (EntityTypes1_8.ObjectType.findById(wrapper.get(Types.BYTE, 0), data) == EntityTypes1_8.ObjectType.FALLING_BLOCK) {
+                    if (EntityTypes1_8.ObjectType.findById(typeID, data) == EntityTypes1_8.ObjectType.FALLING_BLOCK) {
                         final int id = data & 0xFFFF;
                         final int metadata = data >> 16;
                         final IdAndData block = new IdAndData(id, metadata);