Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-25 20:25:19 +01:00
Code Issues Projects Releases Wiki Activity

Clamp controller look yaw for entityinsentients as well

Browse Source
This commit is contained in:
fullwall 2016-11-26 23:25:59 +08:00
parent 974cb61a43
commit d968384d58
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -612,6 +612,12 @@ public class NMSImpl implements NMSBridge {
if (handle instanceof EntityInsentient) { if (handle instanceof EntityInsentient) {
((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(), to.getYaw(), ((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(), to.getYaw(),
to.getPitch()); to.getPitch());
while (((EntityInsentient) handle).aO >= 180F) {
((EntityInsentient) handle).aO -= 360F;
}
while (((EntityInsentient) handle).aO < -180F) {
((EntityInsentient) handle).aO += 360F;
}
} else if (handle instanceof EntityHumanNPC) { } else if (handle instanceof EntityHumanNPC) {
((EntityHumanNPC) handle).setTargetLook(to); ((EntityHumanNPC) handle).setTargetLook(to);
} }

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

@ -108,11 +108,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
@Override @Override
public void A_() { public void A_() {
livingEntityBaseTick();
super.A_(); super.A_();
if (npc == null) if (npc == null)
return; return;
livingEntityBaseTick();
if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) { if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) {
updateEffects = true; updateEffects = true;
} }

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

@ -644,6 +644,13 @@ public class NMSImpl implements NMSBridge {
if (handle instanceof EntityInsentient) { if (handle instanceof EntityInsentient) {
((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(), to.getYaw(), ((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(), to.getYaw(),
to.getPitch()); to.getPitch());
while (((EntityInsentient) handle).aP >= 180F) {
((EntityInsentient) handle).aP -= 360F;
}
while (((EntityInsentient) handle).aP < -180F) {
((EntityInsentient) handle).aP += 360F;
}
} else if (handle instanceof EntityHumanNPC) { } else if (handle instanceof EntityHumanNPC) {
((EntityHumanNPC) handle).setTargetLook(to); ((EntityHumanNPC) handle).setTargetLook(to);
} }