- Reset a player's cache when they are op'd or deop'd.

Author: LlmDl

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

@@ -47,6 +47,8 @@
 import com.palmergames.util.StringMgmt;
 
 import io.papermc.lib.PaperLib;
+
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -1130,7 +1132,9 @@ public void onPlayerTakeLecternBookEvent(PlayerTakeLecternBookEvent event) {
 	public void onPlayerUsesCommand(PlayerCommandPreprocessEvent event) {
 		if (plugin.isError() || !TownyAPI.getInstance().isTownyWorld(event.getPlayer().getWorld()))
 			return;
-		
+
+		checkForOpDeOpCommand(event);
+
 		Resident resident = TownyUniverse.getInstance().getResident(event.getPlayer().getUniqueId());
 
 		// More than likely another plugin using a fake player to run a command or,
@@ -1157,6 +1161,31 @@ public void onPlayerUsesCommand(PlayerCommandPreprocessEvent event) {
 			event.setCancelled(true);
 	}
 
+	private void checkForOpDeOpCommand(PlayerCommandPreprocessEvent event) {
+		String[] args = CommandList.normalizeCommand(event.getMessage()).split(" ");
+		String command = args[0];
+		// Fail early if we aren't looking at /op|deop [playername]
+		if ((!command.equalsIgnoreCase("op") && !command.equalsIgnoreCase("deop")) || args.length != 2)
+			return;
+
+		// Get the target.
+		Player target = Bukkit.getPlayer(args[1]);
+		if (target == null || !target.isOnline())
+			return;
+
+		// Make sure they have the permission to run the command.
+		if (!event.getPlayer().hasPermission("minecraft.command." + command))
+			return;
+
+		// Make sure they're not running the command which will have no effect.
+		if (target.isOp() == "op".equalsIgnoreCase(command))
+			return;
+
+		// Delete the online player's cache because they have been op'd or deop'd.
+		Towny plugin = Towny.getPlugin();
+		plugin.getScheduler().runLater(target, () -> plugin.deleteCache(target), 1L);
+	}
+
 	public boolean blockWarPlayerCommand(Player player, Resident resident, String command) {
 		if (resident.hasTown() && resident.getTownOrNull().hasActiveWar() && blockedWarCommands.containsCommand(command)) {
 			TownyMessaging.sendErrorMsg(player, Translatable.of("msg_command_war_blocked"));
@@ -1394,7 +1423,7 @@ public void onPlayerPickupItem(EntityPickupItemEvent event) {
 		}
 	}
 
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
 	public void onPlayerChangeGameMode(PlayerGameModeChangeEvent event) {
 		if (!TownyAPI.getInstance().isTownyWorld(event.getPlayer().getWorld()))
 			return;

Towny/src/main/resources/ChangeLog.txt

@@ -9113,4 +9113,5 @@ v0.92.0.11:
 0.99.6.0:
   - Bump version number for release.
 0.99.6.1:
-  - Reset a player's cache when they change gamemodes.
+  - Reset a player's cache when they change gamemodes.
+  - Reset a player's cache when they are op'd or deop'd.