Merge tag '0.95.2.22' into siegewar

- Fix /ta set capital {townname} {nationname} not working. - Fix nether portals being created in areas the portal-creator cannot build, courtesy of Siris with PR TownyAdvanced#3745. - Stops 'portal griefing'. - Closes TownyAdvanced#3412. - Fix flagwar not transferring TownBlocks correctly, courtesy of Siris with PR TownyAdvanced#3744. - Add automatic labelling of PRs, automatic labelling of 'stale' to older PRs and Issues, courtesy of Siris with PR TownyAdvanced#3738. - Language files bumped to 0.74.
Goosius1 · Mar 10, 2020 · f0ecbce · f0ecbce
2 parents cc6777e + 5f8464c
commit f0ecbce
Show file tree

Hide file tree

Showing 31 changed files with 412 additions and 238 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -0,0 +1,25 @@
+towny-war:
+    - src/com/palmergames/bukkit/towny/war/*
+
+commands:
+    - src/com/palmergames/bukkit/towny/command/*
+
+towny-objects:
+    - src/com/palmergames/bukkit/towny/object/*
+
+database:
+    - src/com/palmergames/bukkit/towny/db/*
+
+towny-chat:
+    - src/com/palmergames/bukkit/towny/chat/*
+
+economy:
+    - src/com/palmergames/bukkit/towny/object/EconomyAccount.java
+    - src/com/palmergames/bukkit/towny/object/EconomyHandler.java
+    - src/com/palmergames/bukkit/towny/TownyEconomyHandler.java
+
+events:
+    - src/com/palmergames/bukkit/towny/event/*
+
+github:
+    - .github/*
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
@@ -0,0 +1,18 @@
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+#
+# To use this workflow, you will need to set up a .github/labeler.yml
+# file with configuration.  For more information, see:
+# https://github.com/actions/labeler/blob/master/README.md
+
+name: Labeler
+on: [pull_request]
+
+jobs:
+    label:
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/labeler@v2
+              with:
+                  repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -0,0 +1,21 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "0 0 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: "This Issue hasn't had any activity in a while."
+        stale-pr-message: "This Pull Request hasn't had any activity in a while."
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
+        days-before-stale: 180
+
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.palmergames.bukkit.towny</groupId>
     <artifactId>Towny</artifactId>
     <packaging>jar</packaging>
-    <version>0.95.2.20</version>
+    <version>0.95.2.22</version>
 
     <licenses>
         <license>

diff --git a/pom_deb.xml b/pom_deb.xml
@@ -12,7 +12,7 @@
     <groupId>com.palmergames.bukkit.towny</groupId>
     <artifactId>Towny</artifactId>
     <packaging>jar</packaging>
-    <version>0.95.2.20</version>
+    <version>0.95.2.22</version>
 
     <licenses>
         <license>

diff --git a/resources/ChangeLog.txt b/resources/ChangeLog.txt
@@ -4203,4 +4203,31 @@ v0.92.0.11:
     - Closes #3722.
   - Create resident.getNamePostfix() & resident.getNamePrefix() for gather pre/postfixes of kings and mayor residents.
   - Fix possible NPE when Nation taxes were collected from towns.
-  - Fix any *possible* NPE's in NameUtil, courtesy of Siris with PR #3724.
+  - Fix any *possible* NPE's in NameUtil, courtesy of Siris with PR #3724.
+0.95.2.21:
+  - Fix for root cause of issue solved with #3724, courtesy of stzups with PR #3725.
+  - Fix lack of message when an unjailed player uses /res jail foo.
+    - Closes #3726.
+  - Language files bumped to 0.73.
+  - Fix BED_BLOCK in the default config's new_world_settings.plot_management.block_delete.unclaim_delete list.
+  - REQUIRED: amending towny\data\worlds\WORLDNAME.txt files
+    - All existing Towny\data\worlds\WORLDNAME.txt files should have their plotManagementDeleteIds lines changed to WHITE_BED,ORANGE_BED,MAGENTA_BED,LIGHT_BLUE_BED,YELLOW_BED,LIME_BED,PINK_BED,GRAY_BED,LIGHT_GRAY_BED,CYAN_BED,PURPLE_BED,BLUE_BED,BROWN_BED,GREEN_BED,RED_BED,BLACK_BED,TORCH,REDSTONE_WIRE,ACACIA_SIGN,BIRCH_SIGN,DARK_OAK_SIGN,JUNGLE_SIGN,OAK_SIGN,SPRUCE_SIGN,WOODEN_DOOR,ACACIA_WALL_SIGN,BIRCH_WALL_SIGN,DARK_OAK_WALL_SIGN,JUNGLE_WALL_SIGN,OAK_WALL_SIGN,SPRUCE_WALL_SIGN,STONE_PLATE,IRON_DOOR_BLOCK,WOOD_PLATE,REDSTONE_TORCH_OFF,REDSTONE_TORCH_ON,DIODE_BLOCK_OFF,DIODE_BLOCK_ON
+  - Fix Wither Skulls & Shulker Boxes not being in the new_world_settings.plot_management.revert_on_unclaim.block_ignore list.
+  - REQUIRED: amending towny\data\worlds\WORLDNAME.txt files:
+    - All existing Towny\data\worlds\WORLDNAME.txt files should have their plotManagementIgnoreIds lines changed to GOLD_ORE,LAPIS_ORE,LAPIS_BLOCK,GOLD_BLOCK,IRON_ORE,IRON_BLOCK,MOSSY_COBBLESTONE,TORCH,SPAWNER,DIAMOND_ORE,DIAMOND_BLOCK,ACACIA_SIGN,BIRCH_SIGN,DARK_OAK_SIGN,JUNGLE_SIGN,OAK_SIGN,SPRUCE_SIGN,ACACIA_WALL_SIGN,BIRCH_WALL_SIGN,DARK_OAK_WALL_SIGN,JUNGLE_WALL_SIGN,OAK_WALL_SIGN,SPRUCE_WALL_SIGN,GLOWSTONE,EMERALD_ORE,EMERALD_BLOCK,WITHER_SKELETON_SKULL,WITHER_SKELETON_WALL_SKULL,SHULKER_BOX,WHITE_SHULKER_BOX,ORANGE_SHULKER_BOX,MAGENTA_SHULKER_BOX,LIGHT_BLUE_SHULKER_BOX,LIGHT_GRAY_SHULKER_BOX,YELLOW_SHULKER_BOX,LIME_SHULKER_BOX,PINK_SHULKER_BOX,GRAY_SHULKER_BOX,CYAN_SHULKER_BOX,PURPLE_SHULKER_BOX,BLUE_SHULKER_BOX,BROWN_SHULKER_BOX,GREEN_SHULKER_BOX,RED_SHULKER_BOX,BLACK_SHULKER_BOX,BEACON
+  - Fix for Tab Completion leaving out some towns/nations/players, as well as caring about upper/lower-case letters, courtesy of stzups with PR #3728.
+  - Fix allowing /t buy bonus to be used when the config has using_economy: false.
+  - Fix a couple missing options not showing under /plot set perm tab completion.
+  - Fix for more tab completions, courtesy of stzups with PR #3734.
+    - Closes #3733.
+  - Fix a small typo, courtesy of introvertism with PR #3736.
+  - Fix for Towny not clearing a residents' modes when they quit.
+  - Further optimize Trie used in tab completion, courtesy of stzups with PR #3739.
+0.95.2.22:
+  - Fix /ta set capital {townname} {nationname} not working.
+  - Fix nether portals being created in areas the portal-creator cannot build, courtesy of Siris with PR #3745.
+    - Stops 'portal griefing'.
+    - Closes #3412.
+  - Fix flagwar not transferring TownBlocks correctly, courtesy of Siris with PR #3744.
+  - Add automatic labelling of PRs, automatic labelling of 'stale' to older PRs and Issues, courtesy of Siris with PR #3738.
+  - Language files bumped to 0.74.
diff --git a/resources/chinese.yml b/resources/chinese.yml
@@ -1,5 +1,5 @@
 name: Towny
-version: 0.72
+version: 0.74
 language: Chinese
 author: ElgarL
 website: 'http://townyadvanced.github.io/'
@@ -1079,4 +1079,10 @@ msg_err_plot_belongs_to_group_plot_fs2: '土地: %s 属于土地组, 请使用 /
 msg_err_plot_belongs_to_group_plot_nfs: '土地: %s 属于土地组, 请使用 /plot group nfs 停售'
 
 # Added in 0.72
-msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+
+# Added in 0.73
+msg_err_you_aren't currently jailed: 'You are not currently jailed.'
+
+# Added in 0.74
+msg_err_you_are_not_allowed_to_create_the_other_side_of_this_portal: 'You are not allowed to create the other side of this portal in this location.'
diff --git a/resources/english.yml b/resources/english.yml
@@ -1,5 +1,5 @@
 name: Towny
-version: 0.72
+version: 0.74
 language: english
 author: ElgarL
 website: 'http://townyadvanced.github.io/'
@@ -1080,6 +1080,12 @@ msg_err_plot_belongs_to_group_plot_nfs: 'Plot: %s belongs to a group, use /plot
 # Added in 0.72
 msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
 
+# Added in 0.73
+msg_err_you_aren't currently jailed: 'You are not currently jailed.'
+
+# Added in 0.74
+msg_err_you_are_not_allowed_to_create_the_other_side_of_this_portal: 'You are not allowed to create the other side of this portal in this location.'
+
 # Added in ? (for siege war)
 #Siege war happy-path messages
 msg_siege_war_revolt: '&bThe people of %s, led by %s, have revolted against the occupying power of %s, and declared themselves free to choose their own destiny!'

diff --git a/resources/es-mx.yml b/resources/es-mx.yml
@@ -1,5 +1,5 @@
 name: Towny
-version: 0.72
+version: 0.74
 language: español
 author: VreyaViress
 website: 'http://townyadvanced.github.io/'
@@ -1066,4 +1066,10 @@ msg_err_plot_belongs_to_group_plot_fs2: 'Plot: %s belongs to a group, use /plot
 msg_err_plot_belongs_to_group_plot_nfs: 'Plot: %s belongs to a group, use /plot group nfs'
 
 # Added in 0.72
-msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+
+# Added in 0.73
+msg_err_you_aren't currently jailed: 'You are not currently jailed.'
+
+# Added in 0.74
+msg_err_you_are_not_allowed_to_create_the_other_side_of_this_portal: 'You are not allowed to create the other side of this portal in this location.'
diff --git a/resources/french.yml b/resources/french.yml
@@ -1,5 +1,5 @@
 name: Towny
-version: 0.72
+version: 0.74
 language: french
 author: Noiknez,TheCalypso,Cidalex,Mitsu,ARNPIK
 website: 'http://townyadvanced.github.io/'
@@ -1079,4 +1079,10 @@ msg_err_plot_belongs_to_group_plot_fs2: 'La parcelle: %s appartient à un groupe
 msg_err_plot_belongs_to_group_plot_nfs: 'La parcelle: %s appartient à un groupe, faites /plot group nfs'
 
 # Added in 0.72
-msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+
+# Added in 0.73
+msg_err_you_aren't currently jailed: 'You are not currently jailed.'
+
+# Added in 0.74
+msg_err_you_are_not_allowed_to_create_the_other_side_of_this_portal: 'You are not allowed to create the other side of this portal in this location.'
diff --git a/resources/german.yml b/resources/german.yml
@@ -1,5 +1,5 @@
 name: Towny
-version: 0.72
+version: 0.74
 language: german
 author: 'ElgarL, translated by Articdive, Wolf2323, BlocK, Yasu-San and enterih'
 website: 'http://townyadvanced.github.io/'
@@ -1081,4 +1081,10 @@ msg_err_plot_belongs_to_group_plot_fs2: 'Plot: %s belongs to a group, use /plot
 msg_err_plot_belongs_to_group_plot_nfs: 'Plot: %s belongs to a group, use /plot group nfs'
 
 # Added in 0.72
-msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+
+# Added in 0.73
+msg_err_you_aren't currently jailed: 'You are not currently jailed.'
+
+# Added in 0.74
+msg_err_you_are_not_allowed_to_create_the_other_side_of_this_portal: 'You are not allowed to create the other side of this portal in this location.'
diff --git a/resources/italian.yml b/resources/italian.yml
@@ -1,5 +1,5 @@
 name: Towny
-version: 0.72
+version: 0.74
 language: italian
 author: Leomixer17
 website: 'http://townyadvanced.github.io/'
@@ -1080,4 +1080,10 @@ msg_err_plot_belongs_to_group_plot_fs2: 'Plot: %s belongs to a group, use /plot
 msg_err_plot_belongs_to_group_plot_nfs: 'Plot: %s belongs to a group, use /plot group nfs'
 
 # Added in 0.72
-msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+
+# Added in 0.73
+msg_err_you_aren't currently jailed: 'You are not currently jailed.'
+
+# Added in 0.74
+msg_err_you_are_not_allowed_to_create_the_other_side_of_this_portal: 'You are not allowed to create the other side of this portal in this location.'
diff --git a/resources/korean.yml b/resources/korean.yml
@@ -1,5 +1,5 @@
 name: Towny
-version: 0.72
+version: 0.74
 language: 한국어
 author: 'Daybreak 새벽'
 website: 'http://townyadvanced.github.io/'
@@ -991,4 +991,10 @@ msg_err_plot_belongs_to_group_plot_fs2: 'Plot: %s belongs to a group, use /plot
 msg_err_plot_belongs_to_group_plot_nfs: 'Plot: %s belongs to a group, use /plot group nfs'
 
 # Added in 0.72
-msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+
+# Added in 0.73
+msg_err_you_aren't currently jailed: 'You are not currently jailed.'
+
+# Added in 0.74
+msg_err_you_are_not_allowed_to_create_the_other_side_of_this_portal: 'You are not allowed to create the other side of this portal in this location.'
diff --git a/resources/norwegian.yml b/resources/norwegian.yml
@@ -1,5 +1,5 @@
 name: Towny
-version: 0.72
+version: 0.74
 language: norwegian
 author: Nectuz, Walbern
 website: 'http://townyadvanced.github.io/'
@@ -1078,4 +1078,10 @@ msg_err_plot_belongs_to_group_plot_fs2: 'Plot: %s belongs to a group, use /plot
 msg_err_plot_belongs_to_group_plot_nfs: 'Plot: %s belongs to a group, use /plot group nfs'
 
 # Added in 0.72
-msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+
+# Added in 0.73
+msg_err_you_aren't currently jailed: 'You are not currently jailed.'
+
+# Added in 0.74
+msg_err_you_are_not_allowed_to_create_the_other_side_of_this_portal: 'You are not allowed to create the other side of this portal in this location.'
diff --git a/resources/pt-br.yml b/resources/pt-br.yml
@@ -1,5 +1,5 @@
 name: Towny
-version: 0.72
+version: 0.74
 language: português (Brasil)
 author: BannerGames
 website: 'http://townyadvanced.github.io/'
@@ -1082,4 +1082,10 @@ msg_err_plot_belongs_to_group_plot_fs2: 'Terreno: %s pertence a um grupo, use /p
 msg_err_plot_belongs_to_group_plot_nfs: 'Terreno: %s pertence a um grupo, use /plot group nfs'
 
 # Added in 0.72
-msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+
+# Added in 0.73
+msg_err_you_aren't currently jailed: 'You are not currently jailed.'
+
+# Added in 0.74
+msg_err_you_are_not_allowed_to_create_the_other_side_of_this_portal: 'You are not allowed to create the other side of this portal in this location.'
diff --git a/resources/russian.yml b/resources/russian.yml
@@ -1,5 +1,5 @@
 name: Towny
-version: 0.72
+version: 0.74
 language: russian
 author: ElgarL (Plugin developer), Communar (Russian Translation)
 website: 'http://townyadvanced.github.io/'
@@ -1078,4 +1078,10 @@ msg_err_plot_belongs_to_group_plot_fs2: 'Plot: %s belongs to a group, use /plot
 msg_err_plot_belongs_to_group_plot_nfs: 'Plot: %s belongs to a group, use /plot group nfs'
 
 # Added in 0.72
-msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+
+# Added in 0.73
+msg_err_you_aren't currently jailed: 'You are not currently jailed.'
+
+# Added in 0.74
+msg_err_you_are_not_allowed_to_create_the_other_side_of_this_portal: 'You are not allowed to create the other side of this portal in this location.'
diff --git a/resources/spanish.yml b/resources/spanish.yml
@@ -1,5 +1,5 @@
 name: Towny
-version: 0.72
+version: 0.74
 language: spanish
 author: Seruhio, Alvarote1998, Beelzebu
 website: 'http://townyadvanced.github.io/'
@@ -1078,4 +1078,10 @@ msg_err_plot_belongs_to_group_plot_fs2: 'Plot: %s belongs to a group, use /plot
 msg_err_plot_belongs_to_group_plot_nfs: 'Plot: %s belongs to a group, use /plot group nfs'
 
 # Added in 0.72
-msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+
+# Added in 0.73
+msg_err_you_aren't currently jailed: 'You are not currently jailed.'
+
+# Added in 0.74
+msg_err_you_are_not_allowed_to_create_the_other_side_of_this_portal: 'You are not allowed to create the other side of this portal in this location.'
diff --git a/resources/zh-TW.yml b/resources/zh-TW.yml
@@ -1,5 +1,5 @@
 name: Towny
-version: 0.72
+version: 0.74
 language: zh-TW
 author: ElgarL
 website: 'http://townyadvanced.github.io/'
@@ -1083,4 +1083,10 @@ msg_err_plot_belongs_to_group_plot_fs2: '領地%s屬於一個組，使用/plot g
 msg_err_plot_belongs_to_group_plot_nfs: '領地%s屬於一個組，使用/plot group nfs'
 
 # Added in 0.72
-msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+msg_err_admin_controlled_pvp_prevents_you_from_changing_pvp: 'The Admin-controlled %s setting prevents you from toggling pvp to %s.'
+
+# Added in 0.73
+msg_err_you_aren't currently jailed: 'You are not currently jailed.'
+
+# Added in 0.74
+msg_err_you_are_not_allowed_to_create_the_other_side_of_this_portal: 'You are not allowed to create the other side of this portal in this location.'
diff --git a/src/com/palmergames/bukkit/config/ConfigNodes.java b/src/com/palmergames/bukkit/config/ConfigNodes.java
@@ -241,7 +241,7 @@ public enum ConfigNodes {
 			"true"),
 	NWS_PLOT_MANAGEMENT_DELETE(
 			"new_world_settings.plot_management.block_delete.unclaim_delete",
-			"BED_BLOCK,TORCH,REDSTONE_WIRE,ACACIA_SIGN,BIRCH_SIGN,DARK_OAK_SIGN,JUNGLE_SIGN,OAK_SIGN,SPRUCE_SIGN,WOODEN_DOOR,ACACIA_WALL_SIGN,BIRCH_WALL_SIGN,DARK_OAK_WALL_SIGN,JUNGLE_WALL_SIGN,OAK_WALL_SIGN,SPRUCE_WALL_SIGN,STONE_PLATE,IRON_DOOR_BLOCK,WOOD_PLATE,REDSTONE_TORCH_OFF,REDSTONE_TORCH_ON,DIODE_BLOCK_OFF,DIODE_BLOCK_ON",
+			"WHITE_BED,ORANGE_BED,MAGENTA_BED,LIGHT_BLUE_BED,YELLOW_BED,LIME_BED,PINK_BED,GRAY_BED,LIGHT_GRAY_BED,CYAN_BED,PURPLE_BED,BLUE_BED,BROWN_BED,GREEN_BED,RED_BED,BLACK_BED,TORCH,REDSTONE_WIRE,ACACIA_SIGN,BIRCH_SIGN,DARK_OAK_SIGN,JUNGLE_SIGN,OAK_SIGN,SPRUCE_SIGN,WOODEN_DOOR,ACACIA_WALL_SIGN,BIRCH_WALL_SIGN,DARK_OAK_WALL_SIGN,JUNGLE_WALL_SIGN,OAK_WALL_SIGN,SPRUCE_WALL_SIGN,STONE_PLATE,IRON_DOOR_BLOCK,WOOD_PLATE,REDSTONE_TORCH_OFF,REDSTONE_TORCH_ON,DIODE_BLOCK_OFF,DIODE_BLOCK_ON",
 			"# These items will be deleted upon a plot being unclaimed"),
 
 	NWS_PLOT_MANAGEMENT_MAYOR_DELETE_HEADER(
@@ -281,7 +281,7 @@ public enum ConfigNodes {
 			"1s"),
 	NWS_PLOT_MANAGEMENT_REVERT_IGNORE(
 			"new_world_settings.plot_management.revert_on_unclaim.block_ignore",
-			"GOLD_ORE,LAPIS_ORE,LAPIS_BLOCK,GOLD_BLOCK,IRON_ORE,IRON_BLOCK,MOSSY_COBBLESTONE,TORCH,SPAWNER,DIAMOND_ORE,DIAMOND_BLOCK,ACACIA_SIGN,BIRCH_SIGN,DARK_OAK_SIGN,JUNGLE_SIGN,OAK_SIGN,SPRUCE_SIGN,ACACIA_WALL_SIGN,BIRCH_WALL_SIGN,DARK_OAK_WALL_SIGN,JUNGLE_WALL_SIGN,OAK_WALL_SIGN,SPRUCE_WALL_SIGN,GLOWSTONE,EMERALD_ORE,EMERALD_BLOCK",
+			"GOLD_ORE,LAPIS_ORE,LAPIS_BLOCK,GOLD_BLOCK,IRON_ORE,IRON_BLOCK,MOSSY_COBBLESTONE,TORCH,SPAWNER,DIAMOND_ORE,DIAMOND_BLOCK,ACACIA_SIGN,BIRCH_SIGN,DARK_OAK_SIGN,JUNGLE_SIGN,OAK_SIGN,SPRUCE_SIGN,ACACIA_WALL_SIGN,BIRCH_WALL_SIGN,DARK_OAK_WALL_SIGN,JUNGLE_WALL_SIGN,OAK_WALL_SIGN,SPRUCE_WALL_SIGN,GLOWSTONE,EMERALD_ORE,EMERALD_BLOCK,WITHER_SKELETON_SKULL,WITHER_SKELETON_WALL_SKULL,SHULKER_BOX,WHITE_SHULKER_BOX,ORANGE_SHULKER_BOX,MAGENTA_SHULKER_BOX,LIGHT_BLUE_SHULKER_BOX,LIGHT_GRAY_SHULKER_BOX,YELLOW_SHULKER_BOX,LIME_SHULKER_BOX,PINK_SHULKER_BOX,GRAY_SHULKER_BOX,CYAN_SHULKER_BOX,PURPLE_SHULKER_BOX,BLUE_SHULKER_BOX,BROWN_SHULKER_BOX,GREEN_SHULKER_BOX,RED_SHULKER_BOX,BLACK_SHULKER_BOX,BEACON",
 			"# These block types will NOT be regenerated"),
 
 	NWS_PLOT_MANAGEMENT_WILD_MOB_REVERT_HEADER(

diff --git a/src/com/palmergames/bukkit/towny/TownyUniverse.java b/src/com/palmergames/bukkit/towny/TownyUniverse.java
@@ -202,6 +202,7 @@ public void onLogout(Player player) {
         try {
             Resident resident = dataSource.getResident(player.getName());
             resident.setLastOnline(System.currentTimeMillis());
+            resident.clearModes();
             dataSource.saveResident(resident);
         } catch (NotRegisteredException ignored) {
         }