Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-23 09:37:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix wither arrow shield typo

Browse Source
This commit is contained in:
fullwall 2022-09-15 01:01:48 +08:00
parent 12b60fcdf2
commit 03e757d411
13 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/pom.xml
View File

@ -38,6 +38,10 @@
<id>sk89q-repo</id> <id>sk89q-repo</id>
<url>https://maven.enginehub.org/repo/</url> <url>https://maven.enginehub.org/repo/</url>
</repository> </repository>
<repository>
<id>dmulloy2-repo</id>
<url>https://repo.dmulloy2.net/repository/public/</url>
</repository>
</repositories> </repositories>
<dependencies> <dependencies>
@ -48,6 +52,12 @@
<type>jar</type> <type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.7.0</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.powermock</groupId> <groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId> <artifactId>powermock-module-junit4</artifactId>

6
main/src/main/resources/plugin.yml
View File

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

4
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java
View File

@ -66,8 +66,8 @@ public class WitherController extends MobEntityController {
@Override @Override
public boolean df() { public boolean df() {
return npc == null || !npc.data().has("wither-arrow-damageable") ? super.df() return npc == null || !npc.data().has("wither-arrow-shield") ? super.df()
: npc.data().get("wither-arrow-damageable"); : npc.data().get("wither-arrow-shield");
} }
@Override @Override

4
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java
View File

@ -66,8 +66,8 @@ public class WitherController extends MobEntityController {
@Override @Override
public boolean di() { public boolean di() {
return npc == null || !npc.data().has("wither-arrow-damageable") ? super.di() return npc == null || !npc.data().has("wither-arrow-shield") ? super.di()
: npc.data().get("wither-arrow-damageable"); : npc.data().get("wither-arrow-shield");
} }
@Override @Override

4
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java
View File

@ -67,8 +67,8 @@ public class WitherController extends MobEntityController {
@Override @Override
public boolean dn() { public boolean dn() {
return npc == null || !npc.data().has("wither-arrow-damageable") ? super.dn() return npc == null || !npc.data().has("wither-arrow-shield") ? super.dn()
: npc.data().get("wither-arrow-damageable"); : npc.data().get("wither-arrow-shield");
} }
@Override @Override

4
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java
View File

@ -75,8 +75,8 @@ public class WitherController extends MobEntityController {
@Override @Override
public boolean dA() { public boolean dA() {
return npc == null || !npc.data().has("wither-arrow-damageable") ? super.dA() return npc == null || !npc.data().has("wither-arrow-shield") ? super.dA()
: npc.data().get("wither-arrow-damageable"); : npc.data().get("wither-arrow-shield");
} }
@Override @Override

4
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java
View File

@ -68,8 +68,8 @@ public class WitherController extends MobEntityController {
@Override @Override
public boolean dW() { public boolean dW() {
return npc == null || !npc.data().has("wither-arrow-damageable") ? super.dW() return npc == null || !npc.data().has("wither-arrow-shield") ? super.dW()
: npc.data().get("wither-arrow-damageable"); : npc.data().get("wither-arrow-shield");
} }
@Override @Override

4
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java
View File

@ -131,8 +131,8 @@ public class WitherController extends MobEntityController {
@Override @Override
public boolean J_() { public boolean J_() {
return npc == null || !npc.data().has("wither-arrow-damageable") ? super.J_() return npc == null || !npc.data().has("wither-arrow-shield") ? super.J_()
: npc.data().get("wither-arrow-damageable"); : npc.data().get("wither-arrow-shield");
} }
@Override @Override

4
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java
View File

@ -157,8 +157,8 @@ public class WitherController extends MobEntityController {
@Override @Override
public boolean S_() { public boolean S_() {
return npc == null || !npc.data().has("wither-arrow-damageable") ? super.S_() return npc == null || !npc.data().has("wither-arrow-shield") ? super.S_()
: npc.data().get("wither-arrow-damageable"); : npc.data().get("wither-arrow-shield");
} }
} }

4
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java
View File

@ -134,8 +134,8 @@ public class WitherController extends MobEntityController {
@Override @Override
public boolean isPowered() { public boolean isPowered() {
return npc == null || !npc.data().has("wither-arrow-damageable") ? super.isPowered() return npc == null || !npc.data().has("wither-arrow-shield") ? super.isPowered()
: npc.data().get("wither-arrow-damageable"); : npc.data().get("wither-arrow-shield");
} }
@Override @Override

4
v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java
View File

@ -136,8 +136,8 @@ public class WitherController extends MobEntityController {
@Override @Override
public boolean isPowered() { public boolean isPowered() {
return npc == null || !npc.data().has("wither-arrow-damageable") ? super.isPowered() return npc == null || !npc.data().has("wither-arrow-shield") ? super.isPowered()
: npc.data().get("wither-arrow-damageable"); : npc.data().get("wither-arrow-shield");
} }
@Override @Override

4
v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java
View File

@ -128,8 +128,8 @@ public class WitherController extends MobEntityController {
@Override @Override
public boolean isPowered() { public boolean isPowered() {
return npc == null || !npc.data().has("wither-arrow-damageable") ? super.isPowered() return npc == null || !npc.data().has("wither-arrow-shield") ? super.isPowered()
: npc.data().get("wither-arrow-damageable"); : npc.data().get("wither-arrow-shield");
} }
@Override @Override

4
v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java
View File

@ -64,8 +64,8 @@ public class WitherController extends MobEntityController {
@Override @Override
public boolean cm() { public boolean cm() {
return npc == null || !npc.data().has("wither-arrow-damageable") ? super.cm() return npc == null || !npc.data().has("wither-arrow-shield") ? super.cm()
: npc.data().<Boolean> get("wither-arrow-damageable"); : npc.data().<Boolean> get("wither-arrow-shield");
} }
@Override @Override