From 03e757d411835a3c896505d831a0872d9d5271e6 Mon Sep 17 00:00:00 2001 From: fullwall Date: Thu, 15 Sep 2022 01:01:48 +0800 Subject: [PATCH] Fix wither arrow shield typo --- main/pom.xml | 12 +++++++++++- main/src/main/resources/plugin.yml | 10 ++++------ .../nms/v1_10_R1/entity/WitherController.java | 4 ++-- .../nms/v1_11_R1/entity/WitherController.java | 4 ++-- .../nms/v1_12_R1/entity/WitherController.java | 4 ++-- .../nms/v1_13_R2/entity/WitherController.java | 4 ++-- .../nms/v1_14_R1/entity/WitherController.java | 4 ++-- .../nms/v1_15_R1/entity/WitherController.java | 4 ++-- .../nms/v1_16_R3/entity/WitherController.java | 4 ++-- .../nms/v1_17_R1/entity/WitherController.java | 4 ++-- .../nms/v1_18_R2/entity/WitherController.java | 4 ++-- .../nms/v1_19_R1/entity/WitherController.java | 4 ++-- .../nms/v1_8_R3/entity/WitherController.java | 4 ++-- 13 files changed, 37 insertions(+), 29 deletions(-) diff --git a/main/pom.xml b/main/pom.xml index e172e5a23..8a5a863d0 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -22,7 +22,7 @@ spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - + jitpack.io https://jitpack.io @@ -38,6 +38,10 @@ sk89q-repo https://maven.enginehub.org/repo/ + + dmulloy2-repo + https://repo.dmulloy2.net/repository/public/ + @@ -48,6 +52,12 @@ jar provided + + com.comphenix.protocol + ProtocolLib + 4.7.0 + provided + org.powermock powermock-module-junit4 diff --git a/main/src/main/resources/plugin.yml b/main/src/main/resources/plugin.yml index fdc9c65c5..f105f9202 100644 --- 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 index a2cf89f96..8afed18c9 100644 --- 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 index 223f3ecba..4dfdcf180 100644 --- 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 index f2f4da61a..5ba198354 100644 --- 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 index 1fd574a0d..4d2431318 100644 --- 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 index fa78649e8..561ea4224 100644 --- 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 index 9752acc2b..e26cd6db8 100644 --- 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 index 50d400ad8..8265e2333 100644 --- 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 index 9ffcee1c3..5fd56d261 100644 --- 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 index 3d6fba8a5..b38469593 100644 --- 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 index f272c5354..363a8321f 100644 --- 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 index f8f15fafa..e6fe3b044 100644 --- 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(). get("wither-arrow-damageable"); + return npc == null || !npc.data().has("wither-arrow-shield") ? super.cm() + : npc.data(). get("wither-arrow-shield"); } @Override