Cleanup

Author: Jsinco

Towny/src/main/java/com/palmergames/bukkit/towny/event/PlayerChangePlotEvent.java

@@ -53,12 +53,13 @@ public WorldCoord getFrom() {
 	 * @deprecated This event no longer includes the delegate PlayerMoveEvent. Use {@link #getFrom()} and {@link #getTo()} instead.
 	 * @throws UnsupportedOperationException always, do not call.
 	 */
-	@Deprecated(since = "0.102.0.13", forRemoval = true)
+	@Deprecated(since = "0.102.0.14", forRemoval = true)
 	public PlayerMoveEvent getMoveEvent() throws UnsupportedOperationException {
 		throw new UnsupportedOperationException("This event no longer includes the delegate PlayerMoveEvent.");
 	}
 
 	public WorldCoord getTo() {
+
 		return to;
 	}
 

Towny/src/main/java/com/palmergames/bukkit/towny/event/player/PlayerEntersIntoDistrictEvent.java

@@ -52,7 +52,7 @@ public Resident getResident() {
 	 * @deprecated This event no longer includes the delegate PlayerMoveEvent. Use {@link #getFrom()} and {@link #getTo()} instead.
 	 * @throws UnsupportedOperationException always, do not call.
 	 */
-	@Deprecated(since = "0.102.0.13", forRemoval = true)
+	@Deprecated(since = "0.102.0.14", forRemoval = true)
 	public PlayerMoveEvent getPlayerMoveEvent() throws UnsupportedOperationException {
 		throw new UnsupportedOperationException("This event no longer includes the delegate PlayerMoveEvent.");
 	}

Towny/src/main/java/com/palmergames/bukkit/towny/event/player/PlayerEntersIntoTownBorderEvent.java

@@ -52,7 +52,7 @@ public Resident getResident() {
 	 * @deprecated This event no longer includes the delegate PlayerMoveEvent. Use {@link #getFrom()} and {@link #getTo()} instead.
 	 * @throws UnsupportedOperationException always, do not call.
 	 */
-	@Deprecated(since = "0.102.0.13", forRemoval = true)
+	@Deprecated(since = "0.102.0.14", forRemoval = true)
 	public PlayerMoveEvent getPlayerMoveEvent() throws UnsupportedOperationException {
 		throw new UnsupportedOperationException("This event no longer includes the delegate PlayerMoveEvent.");
 	}

Towny/src/main/java/com/palmergames/bukkit/towny/event/player/PlayerExitsFromDistrictEvent.java

@@ -50,7 +50,7 @@ public Resident getResident() {
 	 * @deprecated This event no longer includes the delegate PlayerMoveEvent. Use {@link #getFrom()} and {@link #getTo()} instead.
 	 * @throws UnsupportedOperationException always, do not call.
 	 */
-	@Deprecated(since = "0.102.0.13", forRemoval = true)
+	@Deprecated(since = "0.102.0.14", forRemoval = true)
 	public PlayerMoveEvent getPlayerMoveEvent() throws UnsupportedOperationException {
 		throw new UnsupportedOperationException("This event no longer includes the delegate PlayerMoveEvent.");
 	}

Towny/src/main/java/com/palmergames/bukkit/towny/event/player/PlayerExitsFromTownBorderEvent.java

@@ -50,7 +50,7 @@ public Resident getResident() {
 	 * @deprecated This event no longer includes the delegate PlayerMoveEvent. Use {@link #getFrom()} and {@link #getTo()} instead.
 	 * @throws UnsupportedOperationException always, do not call.
 	 */
-	@Deprecated(since = "0.102.0.13", forRemoval = true)
+	@Deprecated(since = "0.102.0.14", forRemoval = true)
 	public PlayerMoveEvent getPlayerMoveEvent() throws UnsupportedOperationException {
 		throw new UnsupportedOperationException("This event no longer includes the delegate PlayerMoveEvent.");
 	}

Towny/src/main/java/com/palmergames/bukkit/towny/listeners/TownyPlayerListener.java

@@ -785,27 +785,16 @@ public void onPlayerMove(PlayerMoveEvent event) {
 			return;
 		}
 
-		handleCellChange(event.getPlayer(), event.getFrom(), event.getTo(), event);
-	}
-
-	//TODO: Remove when we support 1.21.5 and upwards.
-	@SuppressWarnings("removal")
-	private TeleportCause chorusFruitTeleport = MinecraftVersion.CURRENT_VERSION.isOlderThan(MinecraftVersion.MINECRAFT_1_21_5) ? TeleportCause.CHORUS_FRUIT : TeleportCause.CONSUMABLE_EFFECT;
-
-	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-	public void onPlayerTeleport(PlayerTeleportEvent event) {
-		Player player = event.getPlayer();
-		handleTeleportCellChange(player, event.getCause(), event.getFrom(), event.getTo(), event);
+		handleCellChange(event.getPlayer(), event.getFrom(), event.getTo());
 	}
 
 	/**
 	 * Calls the proper events to handle a player changing townblocks.
 	 * @param player The player who is moving.
 	 * @param from The location the player is moving from.
 	 * @param to The location the player is moving to.
-	 * @param event The cancellable event that triggered this cell change. This will usually be a PlayerMoveEvent, but it could be a PlayerTeleportEvent if the teleport caused a cell change.
 	 */
-	public void handleCellChange(Player player, Location from, Location to, Cancellable event) {
+	public void handleCellChange(Player player, Location from, Location to) {
 		/*
 		 * Abort if we haven't really moved, or if the event.getTo() is null (which is allowed...)
 		 */
@@ -832,10 +821,20 @@ public void handleCellChange(Player player, Location from, Location to, Cancella
 			WorldCoord fromCoord = WorldCoord.parseWorldCoord(from);
 			WorldCoord toCoord = WorldCoord.parseWorldCoord(to);
 
-			onPlayerMoveChunk(player, fromCoord, toCoord, event);
+			onPlayerMoveChunk(player, fromCoord, toCoord);
 		}
 	}
 
+	//TODO: Remove when we support 1.21.5 and upwards.
+	@SuppressWarnings("removal")
+	private TeleportCause chorusFruitTeleport = MinecraftVersion.CURRENT_VERSION.isOlderThan(MinecraftVersion.MINECRAFT_1_21_5) ? TeleportCause.CHORUS_FRUIT : TeleportCause.CONSUMABLE_EFFECT;
+
+	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+	public void onPlayerTeleport(PlayerTeleportEvent event) {
+		Player player = event.getPlayer();
+		handleTeleportCellChange(player, event.getCause(), event.getFrom(), event.getTo(), event);
+	}
+
 	/**
 	 * Handles a player moving from one TownBlock to another, including firing the PlayerChangePlotEvent and handling plot notifications.
 	 * This should only be called from teleportation events.
@@ -864,7 +863,7 @@ public void handleTeleportCellChange(Player player, TeleportCause cause, Locatio
 		boolean isAdmin = !Towny.getPlugin().hasPlayerMode(player, "adminbypass") && (resident.isAdmin() || resident.hasPermissionNode(PermissionNodes.TOWNY_ADMIN_OUTLAW_TELEPORT_BYPASS.getNode()));
 		if (isAdmin) {
 			// Admins don't get restricted further but they do need to fire the PlayerChangePlotEvent.
-			handleCellChange(player, from, to, event);
+			handleCellChange(player, from, to);
 			return;
 		}
 
@@ -925,7 +924,7 @@ public void handleTeleportCellChange(Player player, TeleportCause cause, Locatio
 			resident.removeRespawnProtection();
 
 		// Send the event to the onPlayerMove so Towny can fire the PlayerChangePlotEvent.
-		handleCellChange(player, from, to, event);
+		handleCellChange(player, from, to);
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
@@ -997,7 +996,7 @@ public void onEntityExhaustion(EntityExhaustionEvent event) {
 	/*
 	* PlayerMoveEvent that can fire the PlayerChangePlotEvent
 	*/
-	private void onPlayerMoveChunk(Player player, WorldCoord from, WorldCoord to, Cancellable moveEvent) {
+	private void onPlayerMoveChunk(Player player, WorldCoord from, WorldCoord to) {
 
 		final PlayerCache cache = plugin.getCacheOrNull(player.getUniqueId());
 		if (cache != null)