Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-02-20 06:12:38 +01:00
Code Issues Projects Releases Wiki Activity

Don't call boundary crossing handlers unless a boundary was crossed.

Browse Source
This commit is contained in:
sk89q 2015-01-17 19:17:17 -08:00
parent 7ecf73165b
commit a3d2a1b127
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sk89q/worldguard/session/Session.java
View File

@ -206,11 +206,13 @@ public Location testMoveTo(Player player, Location to, MoveType moveType, boolea
Set<ProtectedRegion> entered = Sets.difference(toSet.getRegions(), lastRegionSet); Set<ProtectedRegion> entered = Sets.difference(toSet.getRegions(), lastRegionSet);
Set<ProtectedRegion> exited = Sets.difference(lastRegionSet, toSet.getRegions()); Set<ProtectedRegion> exited = Sets.difference(lastRegionSet, toSet.getRegions());
if (!entered.isEmpty() || !exited.isEmpty()) {
for (Handler handler : handlers.values()) { for (Handler handler : handlers.values()) {
if (!handler.onCrossBoundary(player, lastValid, to, toSet, entered, exited, moveType) && moveType.isCancellable()) { if (!handler.onCrossBoundary(player, lastValid, to, toSet, entered, exited, moveType) && moveType.isCancellable()) {
return lastValid; return lastValid;
} }
} }
}
lastValid = to; lastValid = to;
lastRegionSet = toSet.getRegions(); lastRegionSet = toSet.getRegions();