Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-12-19 15:48:10 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #190 from skeight/master

Browse Source 
Fix for bug #728 (Multiverse + Worldguard region with exit flag set)
This commit is contained in:
MonsieurApple 2012-02-10 11:40:34 -08:00
commit 47c84beb43
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
View File

@ -303,6 +303,12 @@ public void onPlayerMove(PlayerMoveEvent event) {
return; return;
} }
//Flush states in multiworld scenario
if (state.lastWorld != null && !state.lastWorld.equals(world)) {
plugin.getFlagStateManager().forget(player);
return;
}
// Have to set this state // Have to set this state
if (state.lastExitAllowed == null) { if (state.lastExitAllowed == null) {
state.lastExitAllowed = mgr.getApplicableRegions(toVector(event.getFrom())) state.lastExitAllowed = mgr.getApplicableRegions(toVector(event.getFrom()))
@ -325,7 +331,7 @@ public void onPlayerMove(PlayerMoveEvent event) {
String farewell = set.getFlag(DefaultFlag.FAREWELL_MESSAGE); String farewell = set.getFlag(DefaultFlag.FAREWELL_MESSAGE);
Boolean notifyEnter = set.getFlag(DefaultFlag.NOTIFY_ENTER); Boolean notifyEnter = set.getFlag(DefaultFlag.NOTIFY_ENTER);
Boolean notifyLeave = set.getFlag(DefaultFlag.NOTIFY_LEAVE); Boolean notifyLeave = set.getFlag(DefaultFlag.NOTIFY_LEAVE);
if (state.lastFarewell != null && (farewell == null if (state.lastFarewell != null && (farewell == null
|| !state.lastFarewell.equals(farewell))) { || !state.lastFarewell.equals(farewell))) {
String replacedFarewell = plugin.replaceMacros( String replacedFarewell = plugin.replaceMacros(