Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-10-03 18:07:26 +02:00
Code Issues Projects Releases Wiki Activity

I have 0.47 problems but stairs work now

Browse Source
This commit is contained in:
fullwall 2012-10-30 17:49:54 +08:00
parent 4ebb4c98b3
commit fdbd6f7afb
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
View File

@ -141,8 +141,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
motY += 0.04; motY += 0.04;
} else //(handled elsewhere)*/ } else //(handled elsewhere)*/
if (onGround && bW == 0) { if (onGround && bW == 0) {
// bf(); // jump // bf(); // jump commented out as 0.47 works better for stairs
motY = 0.5F; motY = 0.47F;
bW = 10; bW = 10;
} }
} else } else
@ -151,15 +151,19 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
bD *= 0.98F; bD *= 0.98F;
bE *= 0.98F; bE *= 0.98F;
bF *= 0.9F; bF *= 0.9F;
float speed = npc.getNavigator().getDefaultParameters().speed();
e(speed);
float prev = aM; float prev = aM;
aM *= by() * speed; aM *= by();
e(bD, bE); // movement method e(bD, bE); // movement method
aM = prev; aM = prev;
NMS.setHeadYaw(this, yaw); NMS.setHeadYaw(this, yaw);
} }
@Override
public float by() {
return super.by() * npc.getNavigator().getDefaultParameters().speed();
}
public static class PlayerNPC extends CraftPlayer implements NPCHolder { public static class PlayerNPC extends CraftPlayer implements NPCHolder {
private final CitizensNPC npc; private final CitizensNPC npc;