Merge pull request #377 from PseudoKnight/fixes

Move player location resets to MONITOR level event handlers

Author: PseudoKnight

src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitPlayerListener.java

@@ -84,10 +84,6 @@ public void onPlayerInteract(PlayerInteractEvent e) {
 	public void onPlayerRespawn(PlayerRespawnEvent event) {
 		BukkitMCPlayerRespawnEvent pre = new BukkitMCPlayerRespawnEvent(event);
 		EventUtils.TriggerListener(Driver.PLAYER_SPAWN, "player_spawn", pre);
-		// Reset player_move lastLocations
-		for(Integer i : PlayerEvents.GetThresholdList()) {
-			PlayerEvents.GetLastLocations(i).put(event.getPlayer().getName(), new BukkitMCLocation(event.getRespawnLocation()));
-		}
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled=true)
@@ -222,12 +218,6 @@ public void onPlayerTeleport(PlayerTeleportEvent event) {
 
 		BukkitMCPlayerTeleportEvent pte = new BukkitMCPlayerTeleportEvent(event);
 		EventUtils.TriggerListener(Driver.PLAYER_TELEPORT, "player_teleport", pte);
-		if(!pte.isCancelled()) {
-			// Reset player_move lastLocations
-			for(Integer i : PlayerEvents.GetThresholdList()) {
-				PlayerEvents.GetLastLocations(i).put(event.getPlayer().getName(), new BukkitMCLocation(event.getTo()));
-			}
-		}
 	}
 
 
@@ -320,4 +310,25 @@ public void onPlayerMove(PlayerMoveEvent event) {
 			}
 		}
 	}
+
+	// Reset player_move lastLocations when player respawns or teleports
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onNewRespawnLocation(PlayerRespawnEvent event) {
+		for(Integer i : PlayerEvents.GetThresholdList()) {
+			PlayerEvents.GetLastLocations(i).put(event.getPlayer().getName(),
+					new BukkitMCLocation(event.getRespawnLocation()));
+		}
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onNewTeleportLocation(PlayerTeleportEvent event) {
+		if (event.getFrom().equals(event.getTo())) {
+			return;
+		}
+		if(!event.isCancelled()) {
+			for(Integer i : PlayerEvents.GetThresholdList()) {
+				PlayerEvents.GetLastLocations(i).put(event.getPlayer().getName(), new BukkitMCLocation(event.getTo()));
+			}
+		}
+	}
 }