Reconfigure Git Organization and Fix Kick Prompt not Kicking

benny-conn · Jan 27, 2021 · 005ec91 · 005ec91
1 parent ad2d09e
commit 005ec91
Show file tree

Hide file tree

Showing 25 changed files with 3 additions and 143 deletions.
diff --git a/TownyMenu/pom.xml b/TownyMenu/pom.xml
diff --git a/.../tolmikarc/townymenu/TownyMenuPlugin.java → .../tolmikarc/townymenu/TownyMenuPlugin.java b/.../tolmikarc/townymenu/TownyMenuPlugin.java → .../tolmikarc/townymenu/TownyMenuPlugin.java
diff --git a/...et/tolmikarc/townymenu/plot/PlotMenu.java → ...et/tolmikarc/townymenu/plot/PlotMenu.java b/...et/tolmikarc/townymenu/plot/PlotMenu.java → ...et/tolmikarc/townymenu/plot/PlotMenu.java
diff --git a/...wnymenu/plot/command/PlotMenuCommand.java → ...wnymenu/plot/command/PlotMenuCommand.java b/...wnymenu/plot/command/PlotMenuCommand.java → ...wnymenu/plot/command/PlotMenuCommand.java
diff --git a/...ownymenu/plot/prompt/PlotEvictPrompt.java → ...ownymenu/plot/prompt/PlotEvictPrompt.java b/...ownymenu/plot/prompt/PlotEvictPrompt.java → ...ownymenu/plot/prompt/PlotEvictPrompt.java
diff --git a/...nymenu/plot/prompt/PlotForSalePrompt.java → ...nymenu/plot/prompt/PlotForSalePrompt.java b/...nymenu/plot/prompt/PlotForSalePrompt.java → ...nymenu/plot/prompt/PlotForSalePrompt.java
diff --git a/...enu/plot/prompt/PlotNotForSalePrompt.java → ...enu/plot/prompt/PlotNotForSalePrompt.java b/...enu/plot/prompt/PlotNotForSalePrompt.java → ...enu/plot/prompt/PlotNotForSalePrompt.java
diff --git a/...nymenu/plot/prompt/PlotSetTypePrompt.java → ...nymenu/plot/prompt/PlotSetTypePrompt.java b/...nymenu/plot/prompt/PlotSetTypePrompt.java → ...nymenu/plot/prompt/PlotSetTypePrompt.java
diff --git a/...karc/townymenu/settings/Localization.java → ...karc/townymenu/settings/Localization.java b/...karc/townymenu/settings/Localization.java → ...karc/townymenu/settings/Localization.java
diff --git a/...olmikarc/townymenu/settings/Settings.java → ...olmikarc/townymenu/settings/Settings.java b/...olmikarc/townymenu/settings/Settings.java → ...olmikarc/townymenu/settings/Settings.java
diff --git a/...et/tolmikarc/townymenu/town/TownMenu.java → ...et/tolmikarc/townymenu/town/TownMenu.java b/...et/tolmikarc/townymenu/town/TownMenu.java → ...et/tolmikarc/townymenu/town/TownMenu.java
diff --git a/...wnymenu/town/command/TownMenuCommand.java → ...wnymenu/town/command/TownMenuCommand.java b/...wnymenu/town/command/TownMenuCommand.java → ...wnymenu/town/command/TownMenuCommand.java
diff --git a/...ownymenu/town/prompt/TownBoardPrompt.java → ...ownymenu/town/prompt/TownBoardPrompt.java b/...ownymenu/town/prompt/TownBoardPrompt.java → ...ownymenu/town/prompt/TownBoardPrompt.java
diff --git a/...nymenu/town/prompt/TownDepositPrompt.java → ...nymenu/town/prompt/TownDepositPrompt.java b/...nymenu/town/prompt/TownDepositPrompt.java → ...nymenu/town/prompt/TownDepositPrompt.java
diff --git a/...menu/town/prompt/TownGiveMayorPrompt.java → ...menu/town/prompt/TownGiveMayorPrompt.java b/...menu/town/prompt/TownGiveMayorPrompt.java → ...menu/town/prompt/TownGiveMayorPrompt.java
diff --git a/...townymenu/town/prompt/TownKickPrompt.java → ...townymenu/town/prompt/TownKickPrompt.java b/...townymenu/town/prompt/TownKickPrompt.java → ...townymenu/town/prompt/TownKickPrompt.java
@@ -1,10 +1,6 @@
 package net.tolmikarc.townymenu.town.prompt;
 
-import com.palmergames.bukkit.towny.TownyAPI;
-import com.palmergames.bukkit.towny.exceptions.EmptyTownException;
-import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
 import com.palmergames.bukkit.towny.object.Resident;
-import com.palmergames.bukkit.towny.object.Town;
 import net.tolmikarc.townymenu.settings.Localization;
 import org.bukkit.conversations.ConversationContext;
 import org.bukkit.conversations.Prompt;
@@ -36,16 +32,9 @@ protected boolean isInputValid(ConversationContext context, String input) {
 		if (!getPlayer(context).hasPermission("towny.command.town.kick"))
 			return null;
 
-		try {
-			if (input.toLowerCase().equals(Localization.CONFIRM)) {
-				Town town = resident.getTown();
-				town.removeResident(resident);
-				TownyAPI.getInstance().getDataSource().saveTown(town);
-				TownyAPI.getInstance().getDataSource().saveResident(resident);
-				tell(Localization.TownConversables.Kick.RESPONSE.replace("{player}", resident.getName()));
-			}
-		} catch (EmptyTownException | NotRegisteredException e) {
-			e.printStackTrace();
+		if (input.toLowerCase().equals(Localization.CONFIRM)) {
+			resident.removeTown();
+			tell(Localization.TownConversables.Kick.RESPONSE.replace("{player}", resident.getName()));
 		}
 
 

diff --git a/...townymenu/town/prompt/TownNamePrompt.java → ...townymenu/town/prompt/TownNamePrompt.java b/...townymenu/town/prompt/TownNamePrompt.java → ...townymenu/town/prompt/TownNamePrompt.java
diff --git a/...townymenu/town/prompt/TownRankPrompt.java → ...townymenu/town/prompt/TownRankPrompt.java b/...townymenu/town/prompt/TownRankPrompt.java → ...townymenu/town/prompt/TownRankPrompt.java
diff --git a/...wnymenu/town/prompt/TownSetTaxPrompt.java → ...wnymenu/town/prompt/TownSetTaxPrompt.java b/...wnymenu/town/prompt/TownSetTaxPrompt.java → ...wnymenu/town/prompt/TownSetTaxPrompt.java
diff --git a/...ownymenu/town/prompt/TownTitlePrompt.java → ...ownymenu/town/prompt/TownTitlePrompt.java b/...ownymenu/town/prompt/TownTitlePrompt.java → ...ownymenu/town/prompt/TownTitlePrompt.java
diff --git a/...ymenu/town/prompt/TownWithdrawPrompt.java → ...ymenu/town/prompt/TownWithdrawPrompt.java b/...ymenu/town/prompt/TownWithdrawPrompt.java → ...ymenu/town/prompt/TownWithdrawPrompt.java
diff --git a/...in/resources/localization/messages_en.yml → ...in/resources/localization/messages_en.yml b/...in/resources/localization/messages_en.yml → ...in/resources/localization/messages_en.yml
diff --git a/...in/resources/localization/messages_es.yml → ...in/resources/localization/messages_es.yml b/...in/resources/localization/messages_es.yml → ...in/resources/localization/messages_es.yml
diff --git a/TownyMenu/src/main/resources/plugin.yml → src/main/resources/plugin.yml b/TownyMenu/src/main/resources/plugin.yml → src/main/resources/plugin.yml
diff --git a/TownyMenu/src/main/resources/settings.yml → src/main/resources/settings.yml b/TownyMenu/src/main/resources/settings.yml → src/main/resources/settings.yml