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

Use onPreSpawn event to avoid 'FOUC' in armorstands. Fix invulnerable ticks being reduced too quickly.

This commit is contained in:
fullwall 2021-09-23 14:12:44 +08:00
parent 620cda6542
commit 3d3de6576d
9 changed files with 60 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
View File

@ -255,6 +255,16 @@ public class CitizensNPC extends AbstractNPC {
entityController.spawn(at.clone(), this);
getEntity().setMetadata(NPC_METADATA_MARKER, new FixedMetadataValue(CitizensAPI.getPlugin(), true));
Collection<Trait> onPreSpawn = traits.values();
for (Trait trait : onPreSpawn.toArray(new Trait[onPreSpawn.size()])) {
try {
trait.onPreSpawn();
} catch (Throwable ex) {
Messaging.severeTr(Messages.TRAIT_ONSPAWN_FAILED, trait.getName(), getId());
ex.printStackTrace();
}
}
boolean loaded = Util.isLoaded(at);
boolean couldSpawn = !loaded ? false : NMS.addEntityToWorld(getEntity(), CreatureSpawnEvent.SpawnReason.CUSTOM);
@ -294,10 +304,7 @@ public class CitizensNPC extends AbstractNPC {
navigator.onSpawn();
// Modify NPC using traits after the entity has been created
Collection<Trait> onSpawn = traits.values();
// work around traits modifying the map during this iteration.
for (Trait trait : onSpawn.toArray(new Trait[onSpawn.size()])) {
try {
trait.onSpawn();

87
main/src/main/java/net/citizensnpcs/trait/ArmorStandTrait.java
View File

@ -65,54 +65,59 @@ public class ArmorStandTrait extends Trait {
return visible;
}
@Override
public void onPreSpawn() {
onSpawn();
}
@Override
public void onSpawn() {
if (npc.getEntity() instanceof ArmorStand) {
ArmorStand entity = (ArmorStand) npc.getEntity();
if (leftArm != null) {
entity.setLeftArmPose(leftArm);
}
if (leftLeg != null) {
entity.setLeftLegPose(leftLeg);
}
if (rightArm != null) {
entity.setRightArmPose(rightArm);
}
if (rightLeg != null) {
entity.setRightLegPose(rightLeg);
}
if (body != null) {
entity.setBodyPose(body);
}
if (head != null) {
entity.setHeadPose(head);
}
entity.setVisible(visible);
entity.setGravity(gravity);
entity.setArms(hasarms);
entity.setBasePlate(hasbaseplate);
entity.setSmall(small);
entity.setMarker(marker);
if (!(npc.getEntity() instanceof ArmorStand))
return;
ArmorStand entity = (ArmorStand) npc.getEntity();
if (leftArm != null) {
entity.setLeftArmPose(leftArm);
}
if (leftLeg != null) {
entity.setLeftLegPose(leftLeg);
}
if (rightArm != null) {
entity.setRightArmPose(rightArm);
}
if (rightLeg != null) {
entity.setRightLegPose(rightLeg);
}
if (body != null) {
entity.setBodyPose(body);
}
if (head != null) {
entity.setHeadPose(head);
}
entity.setVisible(visible);
entity.setGravity(gravity);
entity.setArms(hasarms);
entity.setBasePlate(hasbaseplate);
entity.setSmall(small);
entity.setMarker(marker);
}
@Override
public void run() {
if (npc.getEntity() instanceof ArmorStand) {
ArmorStand entity = (ArmorStand) npc.getEntity();
body = entity.getBodyPose();
leftArm = entity.getLeftArmPose();
leftLeg = entity.getLeftLegPose();
rightArm = entity.getRightArmPose();
rightLeg = entity.getRightLegPose();
head = entity.getHeadPose();
entity.setVisible(visible);
entity.setGravity(gravity);
entity.setArms(hasarms);
entity.setBasePlate(hasbaseplate);
entity.setSmall(small);
entity.setMarker(marker);
}
if (!(npc.getEntity() instanceof ArmorStand))
return;
ArmorStand entity = (ArmorStand) npc.getEntity();
body = entity.getBodyPose();
leftArm = entity.getLeftArmPose();
leftLeg = entity.getLeftLegPose();
rightArm = entity.getRightArmPose();
rightLeg = entity.getRightLegPose();
head = entity.getHeadPose();
entity.setVisible(visible);
entity.setGravity(gravity);
entity.setArms(hasarms);
entity.setBasePlate(hasbaseplate);
entity.setSmall(small);
entity.setMarker(marker);
}
/**

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

@ -127,10 +127,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
boolean navigating = npc.getNavigator().isNavigating();
updatePackets(navigating);
if (noDamageTicks > 0) {
--noDamageTicks;
}
npc.update();
}

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

@ -140,10 +140,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
boolean navigating = npc.getNavigator().isNavigating();
updatePackets(navigating);
if (noDamageTicks > 0) {
--noDamageTicks;
}
npc.update();
}

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

@ -421,10 +421,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
boolean navigating = npc.getNavigator().isNavigating();
updatePackets(navigating);
if (noDamageTicks > 0) {
--noDamageTicks;
}
npc.update();
}

5
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java
View File

@ -424,11 +424,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
boolean navigating = npc.getNavigator().isNavigating();
updatePackets(navigating);
if (noDamageTicks > 0) {
--noDamageTicks;
}
npc.update();
}

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

@ -170,7 +170,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
public void run() {
((WorldServer) world).removeEntity(EntityHumanNPC.this);
}
}, 35); // give enough time for death and smoke animation
}, 15); // give enough time for death and smoke animation
}
@Override
@ -425,10 +425,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
boolean navigating = npc.getNavigator().isNavigating();
updatePackets(navigating);
if (noDamageTicks > 0) {
--noDamageTicks;
}
npc.update();
/*
double diff = this.yaw - this.aK;

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

@ -183,7 +183,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
public void run() {
((WorldServer) world).removeEntity(EntityHumanNPC.this);
}
}, 35); // give enough time for death and smoke animation
}, 15); // give enough time for death and smoke animation
}
@Override
@ -455,10 +455,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
boolean navigating = npc.getNavigator().isNavigating();
updatePackets(navigating);
if (noDamageTicks > 0) {
--noDamageTicks;
}
npc.update();
/*
double diff = this.yaw - this.aK;

8
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java
View File

@ -197,11 +197,11 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
if (this.hurtTime > 0)
this.hurtTime--;
if (this.invulnerableTime > 0)
this.invulnerableTime--;
if (isDeadOrDying()) {
tickDeath();
}
if (this.lastHurtByPlayerTime > 0) {
this.lastHurtByPlayerTime--;
} else {
@ -482,10 +482,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
updatePackets(npc.getNavigator().isNavigating());
if (invulnerableTime > 0) {
--invulnerableTime;
}
npc.update();
}