Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-23 01:27:33 +01:00
Code Issues Projects Releases Wiki Activity

Try to avoid defaulting to 0 yaw

Browse Source
This commit is contained in:
fullwall 2016-12-02 19:38:06 +08:00
parent d47a7e88ad
commit 3634bce18e
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,11 +294,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
return skinTracker;
}
@Override
protected float h(float f, float f1) {
return f1;
}
private void initialise(MinecraftServer minecraftServer) {
Socket socket = new EmptySocket();
NetworkManager conn = null;

20
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java
View File

@ -41,6 +41,16 @@ public class MinecartRideableController extends MobEntityController {
this.npc = (CitizensNPC) npc;
}
@Override
public void A_() {
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
} else {
super.A_();
}
}
@Override
public void collide(net.minecraft.server.v1_11_R1.Entity entity) {
// this method is called by both the entities involved - cancelling
@ -97,16 +107,6 @@ public class MinecartRideableController extends MobEntityController {
public NPC getNPC() {
return npc;
}
@Override
public void A_() {
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
} else {
super.A_();
}
}
}
public static class MinecartRideableNPC extends CraftMinecartRideable implements NPCHolder {