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

Fix inappropriate double AI updating for parrots/warden

This commit is contained in:
fullwall 2023-03-26 13:51:26 +08:00
parent bafc6df000
commit 4f0cf51cbd
6 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java
View File

@ -104,8 +104,6 @@ public class ParrotController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public CraftEntity getBukkitEntity() {
if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
@ -153,9 +151,7 @@ public class ParrotController extends MobEntityController {
super.mobTick();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
} else {
if (npc.useMinecraftAI()) {
super.mobTick();
}
npc.update();

6
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java
View File

@ -105,8 +105,6 @@ public class ParrotController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public CraftEntity getBukkitEntity() {
if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
@ -154,9 +152,7 @@ public class ParrotController extends MobEntityController {
super.mobTick();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
} else {
if (npc.useMinecraftAI()) {
super.mobTick();
}
npc.update();

6
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java
View File

@ -73,17 +73,13 @@ public class ParrotController extends MobEntityController {
super.customServerAiStep();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
} else {
if (npc.useMinecraftAI()) {
super.customServerAiStep();
}
npc.update();
}
}
@Override
public SoundEvent getAmbientSound() {
return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND);

6
v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java
View File

@ -75,17 +75,13 @@ public class ParrotController extends MobEntityController {
super.customServerAiStep();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
} else {
if (npc.useMinecraftAI()) {
super.customServerAiStep();
}
npc.update();
}
}
@Override
public SoundEvent getAmbientSound() {
return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND);

4
v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java
View File

@ -75,9 +75,7 @@ public class ParrotController extends MobEntityController {
super.customServerAiStep();
} else {
NMSImpl.updateMinecraftAIState(npc, this);
if (!npc.useMinecraftAI()) {
NMSImpl.updateAI(this);
} else {
if (npc.useMinecraftAI()) {
super.customServerAiStep();
}
npc.update();

2
v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WardenController.java
View File

@ -97,8 +97,6 @@ public class WardenController extends MobEntityController {
npc.update();
if (npc.useMinecraftAI()) {
super.customServerAiStep();
} else {
NMSImpl.updateAI(this);
}
}