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

Fix bugs

Browse Source
This commit is contained in:
fullwall 2012-10-15 20:31:22 +08:00
parent c3630c1da3
commit c71f226abd
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
View File

@ -299,7 +299,12 @@ public class LinearWaypointProvider implements WaypointProvider {
if (selector == null || !event.getNavigator().equals(getNavigator())) if (selector == null || !event.getNavigator().equals(getNavigator()))
return; return;
selector.finish(); selector.finish();
if (event.getNavigator().getTargetAsLocation().equals(currentDestination.getLocation())) Location finished = event.getNavigator().getTargetAsLocation();
if (finished == null || currentDestination == null)
return;
if (finished.getWorld() != currentDestination.getLocation().getWorld())
return;
if (finished.equals(currentDestination.getLocation()))
currentDestination.onReach(npc); currentDestination.onReach(npc);
} }

2
src/main/java/net/citizensnpcs/trait/waypoint/Waypoint.java
View File

@ -26,6 +26,8 @@ public class Waypoint {
} }
public void onReach(NPC npc) { public void onReach(NPC npc) {
if (triggers == null)
return;
for (WaypointTrigger trigger : triggers) for (WaypointTrigger trigger : triggers)
trigger.onWaypointReached(npc, location); trigger.onWaypointReached(npc, location);
} }