Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-08-09 14:12:55 +02:00
Code Issues Projects Releases Wiki Activity

micro-efficiency, improvements

Browse Source 
Don't call .getBlock which is both slow and doesn't work in all cases.
Also don't compare worlds by name, compare by instance.
This commit is contained in:
mcmonkey4eva 2014-12-05 22:11:03 -08:00
parent 1c6a1cc719
commit 33ef7d2a55
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/citizensnpcs/EventListen.java
View File

@ -295,18 +295,19 @@ public class EventListen implements Listener {
}, 60);
}
Location roundLocation(Location input) {
return new Location(input.getWorld(), Math.floor(input.getX()),
Math.floor(input.getY()), Math.floor(input.getZ()));
}
@EventHandler
public void onPlayerWalks(final PlayerMoveEvent event) {
if (event.getFrom().getY() > 255 || event.getFrom().getY() < 0
|| event.getTo().getY() > 255 || event.getTo().getY() < 0) {
return; // Don't fire if players go outside the world, as that would be more difficult to handle.
}
Location from = event.getFrom().getBlock().getLocation();
Location to = event.getTo().getBlock().getLocation();
Location from = roundLocation(event.getFrom());
Location to = roundLocation(event.getTo());
if (from.equals(to)) {
return; // Don't fire on every movement, just full block+.
}
if (!from.getWorld().getName().equalsIgnoreCase(to.getWorld().getName())) {
if (from.getWorld() != to.getWorld()) {
return; // Ignore cross-world movement for now.
}
int maxRad = 50 * 50; // TODO: Adjust me to perfection