Fix 1.18.1 for Paper

1_14_R1/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>tamablefoxes-parent</artifactId>
         <groupId>net.seanomik</groupId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>tamablefoxes_v1_14_R1</artifactId>

1_15_R1/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>tamablefoxes-parent</artifactId>
         <groupId>net.seanomik</groupId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>tamablefoxes_v1_15_R1</artifactId>

1_16_R1/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>tamablefoxes-parent</artifactId>
         <groupId>net.seanomik</groupId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>tamablefoxes_v1_16_R1</artifactId>

1_16_R2/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>tamablefoxes-parent</artifactId>
         <groupId>net.seanomik</groupId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>tamablefoxes_v1_16_R2</artifactId>

1_16_R3/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.seanomik</groupId>
         <artifactId>tamablefoxes-parent</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>tamablefoxes_v1_16_R3</artifactId>

1_17_1_R1/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.seanomik</groupId>
         <artifactId>tamablefoxes-parent</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.2-SNAPSHOT</version>
     </parent>
 
     <build>

1_17_R1/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.seanomik</groupId>
         <artifactId>tamablefoxes-parent</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.2-SNAPSHOT</version>
     </parent>
 
     <build>

1_18_1_R1/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.seanomik</groupId>
         <artifactId>tamablefoxes-parent</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.2-SNAPSHOT</version>
     </parent>
 
     <build>

1_18_1_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_18_1_R1/EntityTamableFox.java

@@ -170,31 +170,49 @@ public class EntityTamableFox extends Fox {
         }
     }
 
-    public boolean isDefending() {
+    protected EntityDataAccessor<Byte> getDataFlagsId() throws NoSuchFieldException, IllegalAccessException {
+        Field dataFlagsField = Fox.class.getDeclaredField("cb"); // DATA_FLAGS_ID
+        dataFlagsField.setAccessible(true);
+        EntityDataAccessor<Byte> dataFlagsId = (EntityDataAccessor<Byte>) dataFlagsField.get(null);
+        dataFlagsField.setAccessible(false);
+
+        return dataFlagsId;
+    }
+
+    protected boolean getFlag(int i) {
         try {
-            Method method = Fox.class.getDeclaredMethod("fL"); // isDefending
+            EntityDataAccessor<Byte> dataFlagsId = getDataFlagsId();
-            method.setAccessible(true);
+
-            boolean defending = (boolean) method.invoke((Fox) this);
+            return ((Byte)super.entityData.get(dataFlagsId) & i) != 0;
-            method.setAccessible(false);
+        } catch (IllegalAccessException | NoSuchFieldException e) {
-            return defending;
-        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
 
         return false;
     }
 
-    public void setDefending(boolean defending) {
+    protected void setFlag(int i, boolean flag) {
         try {
-            Method method = Fox.class.getDeclaredMethod("A", boolean.class); // setDefending
+            EntityDataAccessor<Byte> dataFlagsId = getDataFlagsId();
-            method.setAccessible(true);
+
-            method.invoke((Fox) this, defending);
+            if (flag) {
-            method.setAccessible(false);
+                this.entityData.set(dataFlagsId, (byte)((Byte)this.entityData.get(dataFlagsId) | i));
-        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            } else {
+                this.entityData.set(dataFlagsId, (byte)((Byte)this.entityData.get(dataFlagsId) & ~i));
+            }
+        } catch (IllegalAccessException | NoSuchFieldException e) {
             e.printStackTrace();
         }
     }
 
+    public boolean isDefending() {
+        return getFlag(128);
+    }
+
+    public void setDefending(boolean defending) {
+        setFlag(128, defending);
+    }
+
     @Override
     protected void defineSynchedData() {
         super.defineSynchedData();

1_18_R1/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.seanomik</groupId>
         <artifactId>tamablefoxes-parent</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.2-SNAPSHOT</version>
     </parent>
 
     <build>

Plugin/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.seanomik</groupId>
         <artifactId>tamablefoxes-parent</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>tamablefoxes</artifactId>

Utility/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.seanomik</groupId>
         <artifactId>tamablefoxes-parent</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>tamablefoxes-util</artifactId>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.seanomik</groupId>
     <artifactId>tamablefoxes-parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>