Fix wither arrow shield typo

CitizensDev · Sep 14, 2022 · 03e757d · 03e757d
1 parent 12b60fc
commit 03e757d
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 29 deletions.
diff --git a/main/pom.xml b/main/pom.xml
@@ -22,7 +22,7 @@
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository> 
+        </repository>
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
@@ -38,6 +38,10 @@
             <id>sk89q-repo</id>
             <url>https://maven.enginehub.org/repo/</url>
         </repository>
+        <repository>
+            <id>dmulloy2-repo</id>
+            <url>https://repo.dmulloy2.net/repository/public/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -48,6 +52,12 @@
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.comphenix.protocol</groupId>
+            <artifactId>ProtocolLib</artifactId>
+            <version>4.7.0</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>

diff --git a/main/src/main/resources/plugin.yml b/main/src/main/resources/plugin.yml
@@ -1,21 +1,19 @@
 name: Citizens
 authors: [fullwall]
-softdepend: [Vault, PlaceholderAPI, WorldGuard]
+softdepend: [Vault, PlaceholderAPI, WorldGuard, ProtocolLib]
 version: ${project.version} (build ${BUILD_NUMBER})
 main: net.citizensnpcs.Citizens
-website: http://www.citizensnpcs.co
+website: https://www.citizensnpcs.co
 api-version: "1.13"
 commands:
   traitc:
     aliases: [trc]
     description: Configures traits
     permission: citizens.trait.help
-  trait:
-    aliases: [tr]
+  trait: 
     description: Trait commands
     permission: citizens.trait.help 
-  citizens:
-    aliases: [citizens2]
+  citizens: 
     description: Administration commands
     permission: citizens.citizens.help
   npc:

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java
@@ -66,8 +66,8 @@ public boolean d(NBTTagCompound save) {
 
         @Override
         public boolean df() {
-            return npc == null || !npc.data().has("wither-arrow-damageable") ? super.df()
-                    : npc.data().get("wither-arrow-damageable");
+            return npc == null || !npc.data().has("wither-arrow-shield") ? super.df()
+                    : npc.data().get("wither-arrow-shield");
         }
 
         @Override

diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java
@@ -66,8 +66,8 @@ public boolean d(NBTTagCompound save) {
 
         @Override
         public boolean di() {
-            return npc == null || !npc.data().has("wither-arrow-damageable") ? super.di()
-                    : npc.data().get("wither-arrow-damageable");
+            return npc == null || !npc.data().has("wither-arrow-shield") ? super.di()
+                    : npc.data().get("wither-arrow-shield");
         }
 
         @Override

diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java
@@ -67,8 +67,8 @@ public boolean d(NBTTagCompound save) {
 
         @Override
         public boolean dn() {
-            return npc == null || !npc.data().has("wither-arrow-damageable") ? super.dn()
-                    : npc.data().get("wither-arrow-damageable");
+            return npc == null || !npc.data().has("wither-arrow-shield") ? super.dn()
+                    : npc.data().get("wither-arrow-shield");
         }
 
         @Override

diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java
@@ -75,8 +75,8 @@ protected SoundEffect D() {
 
         @Override
         public boolean dA() {
-            return npc == null || !npc.data().has("wither-arrow-damageable") ? super.dA()
-                    : npc.data().get("wither-arrow-damageable");
+            return npc == null || !npc.data().has("wither-arrow-shield") ? super.dA()
+                    : npc.data().get("wither-arrow-shield");
         }
 
         @Override

diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java
@@ -68,8 +68,8 @@ public boolean d(NBTTagCompound save) {
 
         @Override
         public boolean dW() {
-            return npc == null || !npc.data().has("wither-arrow-damageable") ? super.dW()
-                    : npc.data().get("wither-arrow-damageable");
+            return npc == null || !npc.data().has("wither-arrow-shield") ? super.dW()
+                    : npc.data().get("wither-arrow-shield");
         }
 
         @Override

diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java
@@ -131,8 +131,8 @@ public boolean isLeashed() {
 
         @Override
         public boolean J_() {
-            return npc == null || !npc.data().has("wither-arrow-damageable") ? super.J_()
-                    : npc.data().get("wither-arrow-damageable");
+            return npc == null || !npc.data().has("wither-arrow-shield") ? super.J_()
+                    : npc.data().get("wither-arrow-shield");
         }
 
         @Override

diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java
@@ -157,8 +157,8 @@ protected boolean n(Entity entity) {
 
         @Override
         public boolean S_() {
-            return npc == null || !npc.data().has("wither-arrow-damageable") ? super.S_()
-                    : npc.data().get("wither-arrow-damageable");
+            return npc == null || !npc.data().has("wither-arrow-shield") ? super.S_()
+                    : npc.data().get("wither-arrow-shield");
         }
     }
 

diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java
@@ -134,8 +134,8 @@ public boolean isLeashed() {
 
         @Override
         public boolean isPowered() {
-            return npc == null || !npc.data().has("wither-arrow-damageable") ? super.isPowered()
-                    : npc.data().get("wither-arrow-damageable");
+            return npc == null || !npc.data().has("wither-arrow-shield") ? super.isPowered()
+                    : npc.data().get("wither-arrow-shield");
         }
 
         @Override

diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java
@@ -136,8 +136,8 @@ public boolean isLeashed() {
 
         @Override
         public boolean isPowered() {
-            return npc == null || !npc.data().has("wither-arrow-damageable") ? super.isPowered()
-                    : npc.data().get("wither-arrow-damageable");
+            return npc == null || !npc.data().has("wither-arrow-shield") ? super.isPowered()
+                    : npc.data().get("wither-arrow-shield");
         }
 
         @Override

diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java
@@ -128,8 +128,8 @@ public boolean isLeashed() {
 
         @Override
         public boolean isPowered() {
-            return npc == null || !npc.data().has("wither-arrow-damageable") ? super.isPowered()
-                    : npc.data().get("wither-arrow-damageable");
+            return npc == null || !npc.data().has("wither-arrow-shield") ? super.isPowered()
+                    : npc.data().get("wither-arrow-shield");
         }
 
         @Override

diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java
@@ -64,8 +64,8 @@ public boolean cc() {
 
         @Override
         public boolean cm() {
-            return npc == null || !npc.data().has("wither-arrow-damageable") ? super.cm()
-                    : npc.data().<Boolean> get("wither-arrow-damageable");
+            return npc == null || !npc.data().has("wither-arrow-shield") ? super.cm()
+                    : npc.data().<Boolean> get("wither-arrow-shield");
         }
 
         @Override