- Fix entities being able to steal items from item frames, courtesy of

Warriorrrr with PR #5594. - Fix NPE on /ta town NAME set board.
TownyAdvanced · Jan 4, 2022 · f32a6cd · f32a6cd
1 parent d0713a3
commit f32a6cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/resources/ChangeLog.txt b/resources/ChangeLog.txt
@@ -7138,4 +7138,6 @@ v0.92.0.11:
     - This enables other plugins to use TownyMessaging, Confirmations and other Towny systems' Translatable language methods.
     - Messages will display to the player in their locale if the language strings are available.
 0.97.5.9:
-  - Refactor some listener code, courtesy of Warriorrrr with PR #5589.
+  - Refactor some listener code, courtesy of Warriorrrr with PR #5589.
+  - Fix entities being able to steal items from item frames, courtesy of Warriorrrr with PR #5594.
+  - Fix NPE on /ta town NAME set board.
diff --git a/src/com/palmergames/bukkit/towny/command/TownCommand.java b/src/com/palmergames/bukkit/towny/command/TownCommand.java
@@ -2127,6 +2127,9 @@ public static void townSet(Player player, String[] split, boolean admin, Town to
 						line = "";
 
 					town.setBoard(line);
+					// Player is null when set via the /townyadmin command.
+					if (player == null)
+						return;
 					TownyMessaging.sendTownBoard(player, town);
 				}
 			} else if (split[0].equalsIgnoreCase("title")) {