Depreciate PlayerTeleportEvent, PlayerRespawnEvent and PlayerPortalEvent

as it's all handled in PlayerChangedWorldEvent.
This also means we no longer update permissions before we change
worlds.

2 files changed, 8 insertions, 15 deletions

diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index fc64363d1..4cfc241c4 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -139,4 +139,5 @@ v 1.9:
 	- Fix world mirroring so it correctly creates data files and data sources for partially mirrored worlds.

 	- Fixed world mirroring so it returns the correct data for the requested world.

 	- Change Service registration to register WorldsHolder instead of AnjoPermissionsHandler. This is the correct entry point for all data.

-	- Depreciate PlayerTeleportEvent as it's all handled in PlayerChangedWorldEvent.
\ No newline at end of file
+	- Depreciate PlayerTeleportEvent, PlayerRespawnEvent and PlayerPortalEvent as it's all handled in PlayerChangedWorldEvent.

+	  This also means we no longer update permissions before we change worlds.
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 053adc9ed..ba4a22f12 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -37,9 +37,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChangedWorldEvent;

 import org.bukkit.event.player.PlayerJoinEvent;

 import org.bukkit.event.player.PlayerKickEvent;

-import org.bukkit.event.player.PlayerPortalEvent;

 import org.bukkit.event.player.PlayerQuitEvent;

-import org.bukkit.event.player.PlayerRespawnEvent;

 import org.bukkit.event.server.PluginDisableEvent;

 import org.bukkit.event.server.PluginEnableEvent;

 import org.bukkit.permissions.Permission;

@@ -345,6 +343,12 @@ public class BukkitPermissions {
 			this.updatePermissions(player, null);

 	}

 

+	/**

+	 * Player events tracked to cause Superperms updates

+	 * 

+	 * @author Steve

+	 *

+	 */

 	protected class PlayerEvents implements Listener {

 

 		@EventHandler(priority = EventPriority.LOWEST)

@@ -365,18 +369,6 @@ public class BukkitPermissions {
 		}

 

 		@EventHandler(priority = EventPriority.LOWEST)

-		public void onPlayerPortal(PlayerPortalEvent event) { // will portal into another world

-			if ((event.getTo() != null) && (!event.getFrom().getWorld().equals(event.getTo().getWorld()))) { // only if world actually changed

-				updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());

-			}

-		}

-

-		@EventHandler(priority = EventPriority.LOWEST)

-		public void onPlayerRespawn(PlayerRespawnEvent event) { // can be respawned in another world

-			updatePermissions(event.getPlayer(), event.getRespawnLocation().getWorld().getName());

-		}

-

-		@EventHandler(priority = EventPriority.LOWEST)

 		public void onPlayerQuit(PlayerQuitEvent event) {

 			if (!GroupManager.isLoaded())

 				return;