Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add /npc wither --invulnerableticks command

This commit is contained in:
fullwall 2024-03-31 23:10:01 +08:00
parent 8cf37b0ecc
commit 9729e356a5
16 changed files with 55 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -3422,7 +3422,7 @@ public class NPCCommands {
@Command(
aliases = { "npc" },
usage = "wither (--invulnerable [true|false]) (--arrow-shield [true|false])",
usage = "wither (--invulnerable [true|false]) (--invulnerable-ticks [ticks]) (--arrow-shield [true|false])",
desc = "",
modifiers = { "wither" },
min = 1,
@ -3431,11 +3431,15 @@ public class NPCCommands {
permission = "citizens.npc.wither")
@Requirements(selected = true, ownership = true, types = { EntityType.WITHER })
public void wither(CommandContext args, CommandSender sender, NPC npc, @Flag("invulnerable") Boolean invulnerable,
@Flag("arrow-shield") Boolean arrows) throws CommandException {
@Flag("arrow-shield") Boolean arrows, @Flag("invulnerable-ticks") Integer invulnerableTicks)
throws CommandException {
WitherTrait trait = npc.getOrAddTrait(WitherTrait.class);
if (invulnerable != null) {
trait.setInvulnerable(invulnerable);
}
if (invulnerableTicks != null) {
trait.setInvulnerableTicks(invulnerableTicks);
}
if (arrows != null) {
trait.setBlocksArrows(arrows);
}

24
main/src/main/java/net/citizensnpcs/trait/WitherTrait.java
View File

@ -18,6 +18,8 @@ public class WitherTrait extends Trait {
private Boolean arrowShield;
@Persist("charged")
private Boolean invulnerable;
@Persist("invulnerableticks")
private Integer invulnerableTicks;
public WitherTrait() {
super("withertrait");
@ -27,8 +29,16 @@ public class WitherTrait extends Trait {
return arrowShield;
}
public Integer getInvulnerableTicks() {
return invulnerableTicks;
}
public boolean isInvulnerable() {
return invulnerable == null ? npc.isProtected() : invulnerable;
if (invulnerable != null)
return invulnerable;
if (invulnerableTicks != null)
return invulnerableTicks > 0;
return npc.isProtected();
}
@Override
@ -36,7 +46,13 @@ public class WitherTrait extends Trait {
if (!(npc.getEntity() instanceof Wither))
return;
Wither wither = (Wither) npc.getEntity();
NMS.setWitherInvulnerable(wither, invulnerable == null ? npc.isProtected() : invulnerable);
if (invulnerable != null) {
NMS.setWitherInvulnerableTicks(wither, invulnerable ? 20 : 0);
} else if (invulnerableTicks != null) {
NMS.setWitherInvulnerableTicks(wither, invulnerableTicks);
} else {
NMS.setWitherInvulnerableTicks(wither, npc.isProtected() ? 20 : 0);
}
if (arrowShield != null) {
npc.data().set("wither-arrow-shield", arrowShield);
} else {
@ -51,4 +67,8 @@ public class WitherTrait extends Trait {
public void setInvulnerable(boolean invulnerable) {
this.invulnerable = invulnerable;
}
public void setInvulnerableTicks(int ticks) {
this.invulnerableTicks = ticks;
}
}

4
main/src/main/java/net/citizensnpcs/util/NMS.java
View File

@ -914,8 +914,8 @@ public class NMS {
BRIDGE.setWardenPose(entity, pose);
}
public static void setWitherInvulnerable(Wither wither, boolean charged) {
BRIDGE.setWitherCharged(wither, charged);
public static void setWitherInvulnerableTicks(Wither wither, int ticks) {
BRIDGE.setWitherInvulnerableTicks(wither, ticks);
}
public static boolean shouldJump(org.bukkit.entity.Entity entity) {

4
main/src/main/java/net/citizensnpcs/util/NMSBridge.java
View File

@ -271,7 +271,9 @@ public interface NMSBridge {
public default void setWardenPose(Entity entity, Object pose) {
}
public void setWitherCharged(Wither wither, boolean charged);
public default void setWitherInvulnerableTicks(Wither wither, int ticks) {
wither.setInvulnerabilityTicks(ticks);
}
public boolean shouldJump(Entity entity);

4
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
View File

@ -1334,9 +1334,9 @@ public class NMSImpl implements NMSBridge {
}
@Override
public void setWitherCharged(Wither wither, boolean charged) {
public void setWitherInvulnerableTicks(Wither wither, int ticks) {
EntityWither handle = ((CraftWither) wither).getHandle();
handle.g(charged ? 20 : 0);
handle.g(ticks);
}
@Override

4
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
View File

@ -1387,9 +1387,9 @@ public class NMSImpl implements NMSBridge {
}
@Override
public void setWitherCharged(Wither wither, boolean charged) {
public void setWitherInvulnerableTicks(Wither wither, int ticks) {
EntityWither handle = ((CraftWither) wither).getHandle();
handle.g(charged ? 20 : 0);
handle.g(ticks);
}
@Override

4
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
View File

@ -1394,9 +1394,9 @@ public class NMSImpl implements NMSBridge {
}
@Override
public void setWitherCharged(Wither wither, boolean charged) {
public void setWitherInvulnerableTicks(Wither wither, int ticks) {
EntityWither handle = ((CraftWither) wither).getHandle();
handle.g(charged ? 20 : 0);
handle.g(ticks);
}
@Override

4
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
View File

@ -1431,9 +1431,9 @@ public class NMSImpl implements NMSBridge {
}
@Override
public void setWitherCharged(Wither wither, boolean charged) {
public void setWitherInvulnerableTicks(Wither wither, int ticks) {
EntityWither handle = ((CraftWither) wither).getHandle();
handle.d(charged ? 20 : 0);
handle.d(ticks);
}
@Override

4
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
View File

@ -1490,9 +1490,9 @@ public class NMSImpl implements NMSBridge {
}
@Override
public void setWitherCharged(Wither wither, boolean charged) {
public void setWitherInvulnerableTicks(Wither wither, int ticks) {
EntityWither handle = ((CraftWither) wither).getHandle();
handle.r(charged ? 20 : 0);
handle.r(ticks);
}
@Override

4
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
View File

@ -1539,9 +1539,9 @@ public class NMSImpl implements NMSBridge {
}
@Override
public void setWitherCharged(Wither wither, boolean charged) {
public void setWitherInvulnerableTicks(Wither wither, int ticks) {
EntityWither handle = ((CraftWither) wither).getHandle();
handle.s(charged ? 20 : 0);
handle.s(ticks);
}
@Override

4
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
View File

@ -1563,9 +1563,9 @@ public class NMSImpl implements NMSBridge {
}
@Override
public void setWitherCharged(Wither wither, boolean charged) {
public void setWitherInvulnerableTicks(Wither wither, int ticks) {
EntityWither handle = ((CraftWither) wither).getHandle();
handle.setInvul(charged ? 20 : 0);
handle.setInvul(ticks);
}
@Override

4
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
View File

@ -1559,9 +1559,9 @@ public class NMSImpl implements NMSBridge {
}
@Override
public void setWitherCharged(Wither wither, boolean charged) {
public void setWitherInvulnerableTicks(Wither wither, int ticks) {
WitherBoss handle = ((CraftWither) wither).getHandle();
handle.setInvulnerableTicks(charged ? 20 : 0);
handle.setInvulnerableTicks(ticks);
}
@Override

4
v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
View File

@ -1567,9 +1567,9 @@ public class NMSImpl implements NMSBridge {
}
@Override
public void setWitherCharged(Wither wither, boolean charged) {
public void setWitherInvulnerableTicks(Wither wither, int ticks) {
WitherBoss handle = ((CraftWither) wither).getHandle();
handle.setInvulnerableTicks(charged ? 20 : 0);
handle.setInvulnerableTicks(ticks);
}
@Override

4
v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
View File

@ -1759,9 +1759,9 @@ public class NMSImpl implements NMSBridge {
}
@Override
public void setWitherCharged(Wither wither, boolean charged) {
public void setWitherInvulnerableTicks(Wither wither, int ticks) {
WitherBoss handle = ((CraftWither) wither).getHandle();
handle.setInvulnerableTicks(charged ? 20 : 0);
handle.setInvulnerableTicks(ticks);
}
@Override

8
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/util/NMSImpl.java
View File

@ -34,7 +34,6 @@ import org.bukkit.craftbukkit.v1_20_R3.boss.CraftBossBar;
import org.bukkit.craftbukkit.v1_20_R3.command.CraftBlockCommandSender;
import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_20_R3.entity.CraftWither;
import org.bukkit.craftbukkit.v1_20_R3.event.CraftEventFactory;
import org.bukkit.craftbukkit.v1_20_R3.event.CraftPortalEvent;
import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftInventoryAnvil;
@ -44,7 +43,6 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.FishHook;
import org.bukkit.entity.Player;
import org.bukkit.entity.Tameable;
import org.bukkit.entity.Wither;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
@ -1722,12 +1720,6 @@ public class NMSImpl implements NMSBridge {
}
}
@Override
public void setWitherCharged(Wither wither, boolean charged) {
WitherBoss handle = ((CraftWither) wither).getHandle();
handle.setInvulnerableTicks(charged ? 20 : 0);
}
@Override
public boolean shouldJump(org.bukkit.entity.Entity entity) {
if (JUMP_FIELD == null || !(entity instanceof org.bukkit.entity.LivingEntity))

4
v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
View File

@ -1258,9 +1258,9 @@ public class NMSImpl implements NMSBridge {
}
@Override
public void setWitherCharged(Wither wither, boolean charged) {
public void setWitherInvulnerableTicks(Wither wither, int ticks) {
EntityWither handle = ((CraftWither) wither).getHandle();
handle.r(charged ? 20 : 0);
handle.r(ticks);
}
@Override