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

Fix

Browse Source
This commit is contained in:
fullwall 2012-09-07 20:28:09 +08:00
parent b69b6091b6
commit 2a33588a85
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/citizensnpcs/command/command/NPCCommands.java
View File

@ -406,6 +406,7 @@ public class NPCCommands {
continue; continue;
Messaging.send(sender, " <e>- <a>" + trait.getName() + "<e>"); Messaging.send(sender, " <e>- <a>" + trait.getName() + "<e>");
} }
npc.getNavigator().setTarget((LivingEntity) sender, false);
} }
@Command( @Command(

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

@ -77,10 +77,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
if (npc == null) if (npc == null)
return; return;
Navigation navigation = getNavigation(); Navigation navigation = getNavigation();
if (!navigation.f() || npc.getNavigator().isNavigating()) { if (!navigation.f()) {
navigation.e(); navigation.e();
moveOnCurrentHeading(); moveOnCurrentHeading();
} else if (motX != 0 || motZ != 0 || motY != 0) { } else if (!npc.getNavigator().isNavigating() && (motX != 0 || motZ != 0 || motY != 0)) {
e(0, 0);// is this necessary? it does gravity/controllable but e(0, 0);// is this necessary? it does gravity/controllable but
// sometimes players sink into the ground // sometimes players sink into the ground
} }