Skip to content

Commit

Permalink
Fix double updating bee/bat/ghast AI
Browse files Browse the repository at this point in the history
  • Loading branch information
@fullwall
fullwall committed Jul 5, 2022
1 parent dfbdfae commit 35dd407
Show file tree
Hide file tree
Showing 25 changed files with 45 additions and 67 deletions.
4 changes: 2 additions & 2 deletions main/src/main/java/net/citizensnpcs/EventListen.java
View file
Expand Up @@ -613,7 +613,7 @@ public void onVehicleDamage(VehicleDamageEvent event) {
if (npc == null) {
return;
}
event.setCancelled(npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true));
event.setCancelled(npc.isProtected());

NPCVehicleDamageEvent damageEvent = new NPCVehicleDamageEvent(npc, event);
Bukkit.getPluginManager().callEvent(damageEvent);
Expand All @@ -635,7 +635,7 @@ public void onVehicleDestroy(VehicleDestroyEvent event) {
if (npc == null) {
return;
}
event.setCancelled(npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true));
event.setCancelled(npc.isProtected());
}

@EventHandler(ignoreCancelled = true)
Expand Down
10 changes: 5 additions & 5 deletions main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View file
Expand Up @@ -2494,15 +2494,15 @@ public void target(CommandContext args, Player sender, NPC npc) {

@Command(
aliases = { "npc" },
usage = "targetable",
usage = "targetable (-t(emporary))",
desc = "Toggles an NPC's targetability",
modifiers = { "targetable" },
min = 1,
max = 1,
flags = "t",
permission = "citizens.npc.targetable")
public void targetable(CommandContext args, CommandSender sender, NPC npc) {
boolean targetable = !npc.data().get(NPC.TARGETABLE_METADATA,
npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true));
boolean targetable = !npc.data().get(NPC.TARGETABLE_METADATA, npc.isProtected());
if (args.hasFlag('t')) {
npc.data().set(NPC.TARGETABLE_METADATA, targetable);
} else {
Expand Down Expand Up @@ -2688,15 +2688,15 @@ public void useitem(CommandContext args, CommandSender sender, NPC npc) throws C

@Command(
aliases = { "npc" },
usage = "vulnerable (-t)",
usage = "vulnerable (-t(emporary))",
desc = "Toggles an NPC's vulnerability",
modifiers = { "vulnerable" },
min = 1,
max = 1,
flags = "t",
permission = "citizens.npc.vulnerable")
public void vulnerable(CommandContext args, CommandSender sender, NPC npc) {
boolean vulnerable = !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
boolean vulnerable = !npc.isProtected();
if (args.hasFlag('t')) {
npc.data().set(NPC.DEFAULT_PROTECTED_METADATA, vulnerable);
} else {
Expand Down
3 changes: 2 additions & 1 deletion v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java
View file
Expand Up @@ -183,8 +183,9 @@ public boolean isLeashed() {
@Override
public void mobTick() {
super.mobTick();
if (npc != null)
if (npc != null) {
npc.update();
}
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java
View file
Expand Up @@ -154,8 +154,8 @@ public void mobTick() {
super.mobTick();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
if (npc.useMinecraftAI()) {
super.mobTick();
}
npc.update();
}
Expand Down
5 changes: 2 additions & 3 deletions v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java
View file
Expand Up @@ -153,10 +153,9 @@ public void mobTick() {
super.mobTick();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
if (npc.useMinecraftAI()) {
super.mobTick();
}
NMSImpl.updateAI(this);
npc.update();
}
}
Expand Down
5 changes: 3 additions & 2 deletions v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java
View file
Expand Up @@ -184,9 +184,10 @@ public boolean isLeashed() {
@Override
public void mobTick() {
super.mobTick();
if (npc != null)
if (npc != null) {
NMSImpl.updateMinecraftAIState(npc, this);
npc.update();
npc.update();
}
}

@Override
Expand Down
3 changes: 0 additions & 3 deletions v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java
View file
Expand Up @@ -142,9 +142,6 @@ public void mobTick() {
if (npc != null) {
npc.update();
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
}
}
super.mobTick();
}
Expand Down
4 changes: 2 additions & 2 deletions v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java
View file
Expand Up @@ -147,8 +147,8 @@ public void mobTick() {
super.mobTick();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
if (npc.useMinecraftAI()) {
super.mobTick();
}
npc.update();
}
Expand Down
5 changes: 2 additions & 3 deletions v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java
View file
Expand Up @@ -146,10 +146,9 @@ public void mobTick() {
super.mobTick();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
if (npc.useMinecraftAI()) {
super.mobTick();
}
NMSImpl.updateAI(this);
npc.update();
}
}
Expand Down
5 changes: 3 additions & 2 deletions v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java
View file
Expand Up @@ -177,9 +177,10 @@ public boolean isLeashed() {
@Override
public void mobTick() {
super.mobTick();
if (npc != null)
if (npc != null) {
NMSImpl.updateMinecraftAIState(npc, this);
npc.update();
npc.update();
}
}

@Override
Expand Down
3 changes: 0 additions & 3 deletions v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java
View file
Expand Up @@ -143,9 +143,6 @@ public void mobTick() {
if (npc != null) {
npc.update();
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
}
}
super.mobTick();
}
Expand Down
4 changes: 2 additions & 2 deletions v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java
View file
Expand Up @@ -76,8 +76,8 @@ public void customServerAiStep() {
super.customServerAiStep();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
if (npc.useMinecraftAI()) {
super.customServerAiStep();
}
npc.update();
}
Expand Down
5 changes: 2 additions & 3 deletions v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java
View file
Expand Up @@ -75,10 +75,9 @@ public void customServerAiStep() {
super.customServerAiStep();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
if (npc.useMinecraftAI()) {
super.customServerAiStep();
}
NMSImpl.updateAI(this);
npc.update();
}
}
Expand Down
5 changes: 3 additions & 2 deletions v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java
View file
Expand Up @@ -90,9 +90,10 @@ protected void checkFallDamage(double d0, boolean flag, BlockState iblockdata, B
@Override
public void customServerAiStep() {
super.customServerAiStep();
if (npc != null)
if (npc != null) {
NMSImpl.updateMinecraftAIState(npc, this);
npc.update();
npc.update();
}
}

@Override
Expand Down
3 changes: 0 additions & 3 deletions v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java
View file
Expand Up @@ -68,9 +68,6 @@ public void customServerAiStep() {
if (npc != null) {
npc.update();
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
}
}
super.customServerAiStep();
}
Expand Down
4 changes: 2 additions & 2 deletions v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java
View file
Expand Up @@ -78,8 +78,8 @@ public void customServerAiStep() {
super.customServerAiStep();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
if (npc.useMinecraftAI()) {
super.customServerAiStep();
}
npc.update();
}
Expand Down
5 changes: 2 additions & 3 deletions v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java
View file
Expand Up @@ -77,10 +77,9 @@ public void customServerAiStep() {
super.customServerAiStep();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
if (npc.useMinecraftAI()) {
super.customServerAiStep();
}
NMSImpl.updateAI(this);
npc.update();
}
}
Expand Down
4 changes: 0 additions & 4 deletions v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java
View file
Expand Up @@ -95,10 +95,6 @@ protected void checkFallDamage(double d0, boolean flag, BlockState iblockdata, B
public void customServerAiStep() {
super.customServerAiStep();
if (npc != null) {
try {
} catch (Throwable e) {
e.printStackTrace();
}
NMSImpl.updateMinecraftAIState(npc, this);
npc.update();
}
Expand Down
5 changes: 3 additions & 2 deletions v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java
View file
Expand Up @@ -91,9 +91,10 @@ protected void checkFallDamage(double d0, boolean flag, BlockState iblockdata, B
@Override
public void customServerAiStep() {
super.customServerAiStep();
if (npc != null)
if (npc != null) {
NMSImpl.updateMinecraftAIState(npc, this);
npc.update();
npc.update();
}
}

@Override
Expand Down
3 changes: 0 additions & 3 deletions v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java
View file
Expand Up @@ -70,9 +70,6 @@ public void customServerAiStep() {
if (npc != null) {
npc.update();
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
}
}
super.customServerAiStep();
}
Expand Down
4 changes: 2 additions & 2 deletions v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BatController.java
View file
Expand Up @@ -78,8 +78,8 @@ public void customServerAiStep() {
super.customServerAiStep();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
if (npc.useMinecraftAI()) {
super.customServerAiStep();
}
npc.update();
}
Expand Down
5 changes: 2 additions & 3 deletions v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BeeController.java
View file
Expand Up @@ -77,10 +77,9 @@ public void customServerAiStep() {
super.customServerAiStep();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
if (npc.useMinecraftAI()) {
super.customServerAiStep();
}
NMSImpl.updateAI(this);
npc.update();
}
}
Expand Down
4 changes: 0 additions & 4 deletions v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermanController.java
View file
Expand Up @@ -95,10 +95,6 @@ protected void checkFallDamage(double d0, boolean flag, BlockState iblockdata, B
public void customServerAiStep() {
super.customServerAiStep();
if (npc != null) {
try {
} catch (Throwable e) {
e.printStackTrace();
}
NMSImpl.updateMinecraftAIState(npc, this);
npc.update();
}
Expand Down
5 changes: 3 additions & 2 deletions v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermiteController.java
View file
Expand Up @@ -91,9 +91,10 @@ protected void checkFallDamage(double d0, boolean flag, BlockState iblockdata, B
@Override
public void customServerAiStep() {
super.customServerAiStep();
if (npc != null)
if (npc != null) {
NMSImpl.updateMinecraftAIState(npc, this);
npc.update();
npc.update();
}
}

@Override
Expand Down
5 changes: 1 addition & 4 deletions v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GhastController.java
View file
Expand Up @@ -69,10 +69,7 @@ public void checkDespawn() {
public void customServerAiStep() {
if (npc != null) {
npc.update();
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
}
NMSImpl.updateMinecraftAIState(npc, this);
}
super.customServerAiStep();
}
Expand Down

0 comments on commit 35dd407

Please sign in to comment.