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

Remove villager force head yaw setting

This commit is contained in:
fullwall 2016-11-26 23:42:23 +08:00
parent d968384d58
commit bc9374d30c
6 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/java/net/citizensnpcs/util/Util.java
View File

@ -55,7 +55,7 @@ public class Util {
if (at == null || entity == null || entity.getWorld() != at.getWorld())
return;
if (at instanceof LivingEntity) {
faceLocation(entity, ((LivingEntity) at).getEyeLocation());
NMS.look(entity, at);
} else {
faceLocation(entity, at.getLocation(AT_LOCATION));
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java
View File

@ -13,7 +13,6 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_10_R1.BlockPosition;
import net.minecraft.server.v1_10_R1.EntityHuman;
@ -206,7 +205,6 @@ public class VillagerController extends MobEntityController {
public void M() {
super.M();
if (npc != null) {
NMS.setHeadYaw(getBukkitEntity(), yaw);
npc.update();
}
}

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

@ -111,9 +111,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
super.A_();
if (npc == null)
return;
livingEntityBaseTick();
livingEntityBaseTick();
if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) {
updateEffects = true;
}
@ -323,6 +321,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
}
public void livingEntityBaseTick() {
cA();
this.aC = this.aD;
this.aJ = this.aK;
if (this.hurtTicks > 0) {

1
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java
View File

@ -169,7 +169,6 @@ public class EvokerController extends MobEntityController {
public void M() {
super.M();
if (npc != null) {
NMS.setHeadYaw(getBukkitEntity(), yaw);
npc.update();
}
}

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java
View File

@ -15,7 +15,6 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_11_R1.BlockPosition;
import net.minecraft.server.v1_11_R1.EntityHuman;
@ -212,7 +211,6 @@ public class VillagerController extends MobEntityController {
public void M() {
super.M();
if (npc != null) {
NMS.setHeadYaw(getBukkitEntity(), yaw);
npc.update();
}
}

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java
View File

@ -13,7 +13,6 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_11_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_11_R1.BlockPosition;
import net.minecraft.server.v1_11_R1.EntityVindicator;
@ -180,7 +179,6 @@ public class VindicatorController extends MobEntityController {
public void M() {
super.M();
if (npc != null) {
NMS.setHeadYaw(getBukkitEntity(), yaw);
npc.update();
}
}