1.6.2 release

* Issues with WrappedPacketInEntityAction on 1.7.10
retrooper · Aug 30, 2020 · d5454b9 · d5454b9
1 parent 427a0ff
commit d5454b9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.retrooper</groupId>
     <artifactId>packetevents</artifactId>
-    <version>1.6.1</version>
+    <version>1.6.2</version>
 
     <!-- You can build the project with this: "mvn clean compile assembly:single" -->
     <build>

diff --git a/...ub/retrooper/packetevents/packetwrappers/in/entityaction/WrappedPacketInEntityAction.java b/...ub/retrooper/packetevents/packetwrappers/in/entityaction/WrappedPacketInEntityAction.java
@@ -15,6 +15,7 @@
 
 public final class WrappedPacketInEntityAction extends WrappedPacket {
     private static final HashMap<String, PlayerAction> cachedPlayerActionNames = new HashMap<String, PlayerAction>();
+    private static final HashMap<Integer, PlayerAction> cachedPlayerActionIDs = new HashMap<Integer, PlayerAction>();
     private static Class<?> entityActionClass;
     @Nullable
     private static Class<?> enumPlayerActionClass;
@@ -41,6 +42,15 @@ public static void load() {
         cachedPlayerActionNames.put("PRESS_SHIFT_KEY", PlayerAction.START_SNEAKING);
         cachedPlayerActionNames.put("RELEASE_SHIFT_KEY", PlayerAction.STOP_SNEAKING);
         cachedPlayerActionNames.put("RIDING_JUMP", PlayerAction.START_RIDING_JUMP);
+
+        cachedPlayerActionIDs.put(1, PlayerAction.START_SNEAKING);
+        cachedPlayerActionIDs.put(2, PlayerAction.STOP_SNEAKING);
+        cachedPlayerActionIDs.put(3, PlayerAction.STOP_SLEEPING);
+        cachedPlayerActionIDs.put(4, PlayerAction.START_SPRINTING);
+        cachedPlayerActionIDs.put(5, PlayerAction.STOP_SPRINTING);
+        cachedPlayerActionIDs.put(6, PlayerAction.START_RIDING_JUMP); //riding jump
+        cachedPlayerActionIDs.put(7, PlayerAction.OPEN_INVENTORY); //horse interaction
+
     }
 
     @Override
@@ -54,11 +64,10 @@ protected void setup() {
                 jumpBoost = Reflection.getField(entityActionClass, int.class, 1).getInt(packet);
             }
 
-            int animationIndex = -1;
-
             //1.7.10
             if (isLowerThan_v_1_8) {
-                animationIndex = Reflection.getField(entityActionClass, int.class, 1).getInt(packet); // TODO: += if packetdataserializer.version < 16
+                int animationIndex = Reflection.getField(entityActionClass, int.class, 1).getInt(packet); // TODO: += if packetdataserializer.version < 16
+                this.action = cachedPlayerActionIDs.get(animationIndex);
             } else {
                 final Object enumObj = Reflection.getField(entityActionClass, enumPlayerActionClass, 0).get(packet);
                 final String enumName = enumObj.toString();
@@ -68,9 +77,6 @@ protected void setup() {
 
             this.entityId = entityId;
             this.jumpBoost = jumpBoost;
-            if (animationIndex != -1) {
-                this.action = PlayerAction.values()[animationIndex];
-            }
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }