Fix npe thrown from /plot group add when group name is not specified. (…

…#3630)

* Fix npe thrown from /plot group add when group name is not specified.

* Fix verion number on lang files

* Changed lang file version numbers

resources/chinese.yml

@@ -1,5 +1,5 @@
 name: Towny
-version: 0.69
+version: 0.70
 language: Chinese
 author: ElgarL
 website: 'http://townyadvanced.github.io/'
@@ -1063,4 +1063,7 @@ status_plot_group_name_and_size: '&2Townblock is part of group: %s. Group has %s
 msg_player_made_group_not_for_sale: '%s made group %s not for sale.'
 
 # Added in 0.69
-msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+
+# Added in 0.70
+msg_err_plot_group_name_required: 'You must specify plot group name ie, /plot group add {name}'

resources/english.yml

@@ -1,5 +1,5 @@
 name: Towny
-version: 0.69
+version: 0.70
 language: english
 author: ElgarL
 website: 'http://townyadvanced.github.io/'
@@ -1062,4 +1062,7 @@ status_plot_group_name_and_size: '&2Townblock is part of group: %s. Group has %s
 msg_player_made_group_not_for_sale: '%s made group %s not for sale.'
 
 # Added in 0.69
-msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+
+# Added in 0.70
+msg_err_plot_group_name_required: 'You must specify plot group name ie, /plot group add {name}'

resources/es-mx.yml

@@ -1,5 +1,5 @@
 name: Towny
-version: 0.69
+version: 0.70
 language: español
 author: VreyaViress
 website: 'http://townyadvanced.github.io/'
@@ -1050,4 +1050,7 @@ status_plot_group_name_and_size: '&2Townblock is part of group: %s. Group has %s
 msg_player_made_group_not_for_sale: '%s made group %s not for sale.'
 
 # Added in 0.69
-msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+
+# Added in 0.70
+msg_err_plot_group_name_required: 'You must specify plot group name ie, /plot group add {name}'

resources/french.yml

@@ -1,5 +1,5 @@
 name: Towny
-version: 0.69
+version: 0.70
 language: french
 author: Noiknez,TheCalypso,Cidalex,Mitsu
 website: 'http://townyadvanced.github.io/'
@@ -1063,4 +1063,7 @@ status_plot_group_name_and_size: '&2Townblock is part of group: %s. Group has %s
 msg_player_made_group_not_for_sale: '%s made group %s n''est pas a vendre.'
 
 # Added in 0.69
-msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+
+# Added in 0.70
+msg_err_plot_group_name_required: 'You must specify plot group name ie, /plot group add {name}'

resources/german.yml

@@ -1,5 +1,5 @@
 name: Towny
-version: 0.69
+version: 0.70
 language: german
 author: 'ElgarL, translated by Articdive, Wolf2323, BlocK, Yasu-San and enterih'
 website: 'http://townyadvanced.github.io/'
@@ -1065,4 +1065,7 @@ status_plot_group_name_and_size: '&2Townblock is part of group: %s. Group has %s
 msg_player_made_group_not_for_sale: '%s made group %s not for sale.'
 
 # Added in 0.69
-msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+
+# Added in 0.70
+msg_err_plot_group_name_required: 'You must specify plot group name ie, /plot group add {name}'

resources/italian.yml

@@ -1,5 +1,5 @@
 name: Towny
-version: 0.69
+version: 0.70
 language: italian
 author: Leomixer17
 website: 'http://townyadvanced.github.io/'
@@ -1064,4 +1064,7 @@ status_plot_group_name_and_size: '&2Townblock is part of group: %s. Group has %s
 msg_player_made_group_not_for_sale: '%s made group %s not for sale.'
 
 # Added in 0.69
-msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+
+# Added in 0.70
+msg_err_plot_group_name_required: 'You must specify plot group name ie, /plot group add {name}'

resources/korean.yml

@@ -1,5 +1,5 @@
 name: Towny
-version: 0.69
+version: 0.70
 language: 한국어
 author: 'Daybreak 새벽'
 website: 'http://townyadvanced.github.io/'
@@ -975,4 +975,7 @@ status_plot_group_name_and_size: '&2Townblock is part of group: %s. Group has %s
 msg_player_made_group_not_for_sale: '%s made group %s not for sale.'
 
 # Added in 0.69
-msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+
+# Added in 0.70
+msg_err_plot_group_name_required: 'You must specify plot group name ie, /plot group add {name}'

resources/norwegian.yml

@@ -1,5 +1,5 @@
 name: Towny
-version: 0.69
+version: 0.70
 language: norwegian
 author: Nectuz, Walbern
 website: 'http://townyadvanced.github.io/'
@@ -1062,4 +1062,7 @@ status_plot_group_name_and_size: '&2Townblock is part of group: %s. Group has %s
 msg_player_made_group_not_for_sale: '%s made group %s not for sale.'
 
 # Added in 0.69
-msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+
+# Added in 0.70
+msg_err_plot_group_name_required: 'You must specify plot group name ie, /plot group add {name}'

resources/pt-br.yml

@@ -1,12 +1,12 @@
 name: Towny
-version: 0.69
+version: 0.70
 language: português (Brasil)
 author: BannerGames
 website: 'http://townyadvanced.github.io/'
 description: >
     Arquivo de língua para todas as mensagens do jogo. Não altere este arquivo.
     Se desejar modificar alguma das entradas, faça uma cópia com outro nome.
-    Arquivos de linguagem alternativos podem ser ativados ao alterar a 
+    Arquivos de linguagem alternativos podem ser ativados ao alterar a
     entrada [language] na config.yml
 
 #
@@ -22,7 +22,7 @@ description: >
 # Preto = &0             Azul Escuro = &1
 # Verde Escuro = &2      Aqua Escuro = &3
 # Vermelho Escuro = &4   Roxo Escuro = &5
-# Dourado = &6           Cinza = &7 
+# Dourado = &6           Cinza = &7
 # Cinza Escuro = &8      Azul = &9
 # Verde = &a             Aqua = &b
 # Vermelho = &c          Roxo Claro = &d
@@ -1066,4 +1066,7 @@ status_plot_group_name_and_size: '&2O terreno da cidade faz parte de um grupo: %
 msg_player_made_group_not_for_sale: '%s tirou o grupo %s do estado de venda.'
 
 # Added in 0.69
-msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+
+# Added in 0.70
+msg_err_plot_group_name_required: 'You must specify plot group name ie, /plot group add {name}'

resources/russian.yml

@@ -1,5 +1,5 @@
 name: Towny
-version: 0.69
+version: 0.70
 language: russian
 author: ElgarL (Plugin developer), Communar (Russian Translation)
 website: 'http://townyadvanced.github.io/'
@@ -1062,4 +1062,7 @@ status_plot_group_name_and_size: '&2Townblock is part of group: %s. Group has %s
 msg_player_made_group_not_for_sale: '%s made group %s not for sale.'
 
 # Added in 0.69
-msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+
+# Added in 0.70
+msg_err_plot_group_name_required: 'You must specify plot group name ie, /plot group add {name}'

resources/spanish.yml

@@ -1,5 +1,5 @@
 name: Towny
-version: 0.69
+version: 0.70
 language: spanish
 author: Seruhio, Alvarote1998, Beelzebu
 website: 'http://townyadvanced.github.io/'
@@ -1062,4 +1062,7 @@ status_plot_group_name_and_size: '&2Townblock is part of group: %s. Group has %s
 msg_player_made_group_not_for_sale: '%s made group %s not for sale.'
 
 # Added in 0.69
-msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+msg_err_cannot_set_group_to_jail: 'Plot groups cannot be set to jail types.'
+
+# Added in 0.70
+msg_err_plot_group_name_required: 'You must specify plot group name ie, /plot group add {name}'

src/com/palmergames/bukkit/towny/command/PlotCommand.java

@@ -1301,6 +1301,9 @@ private boolean handlePlotGroupCommand(String[] split, Player player) throws Tow
 
 				// Add the plot group to the town set.
 				town.addPlotGroup(newGroup);
+			} else {
+				TownyMessaging.sendErrorMsg(player, TownySettings.getLangString("msg_err_plot_group_name_required"));
+				return false;
 			}
 
 			townyUniverse.getDataSource().savePlotGroupList();