Removed handler command enums.

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java

@@ -45,25 +45,11 @@ public class AdminPledge implements IAdminCommandHandler
 		"admin_pledge"
 	};
 	
-	private enum CommandEnum
-	{
-		admin_pledge
-	}
-	
-	private enum ActionEnum
-	{
-		create,
-		dismiss,
-		info,
-		setlevel,
-		rep
-	}
-	
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
 		final StringTokenizer st = new StringTokenizer(command);
-		final CommandEnum comm = CommandEnum.valueOf(st.nextToken());
+		final String comm = st.nextToken();
 		if (comm == null)
 		{
 			return false;
@@ -71,7 +57,7 @@ public class AdminPledge implements IAdminCommandHandler
 		
 		switch (comm)
 		{
-			case admin_pledge:
+			case "admin_pledge":
 			{
 				final WorldObject target = activeChar.getTarget();
 				PlayerInstance player = null;
@@ -85,34 +71,37 @@ public class AdminPledge implements IAdminCommandHandler
 					showMainPage(activeChar);
 					return false;
 				}
+				
 				final String name = player.getName();
-				ActionEnum action = null;
+				String action = null;
 				String parameter = null;
 				if (st.hasMoreTokens())
 				{
-					action = ActionEnum.valueOf(st.nextToken()); // create|info|dismiss|setlevel|rep
+					action = st.nextToken(); // create|info|dismiss|setlevel|rep
+				}
+				
 				if (action == null)
 				{
 					BuilderUtil.sendSysMessage(activeChar, "Not allowed Action on Clan");
 					showMainPage(activeChar);
 					return false;
 				}
-				}
+				
-				if ((action != ActionEnum.create) && !player.isClanLeader())
+				if (!action.equals("create") && !player.isClanLeader())
 				{
 					activeChar.sendPacket(new SystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER).addString(name));
 					showMainPage(activeChar);
 					return false;
 				}
+				
 				if (st.hasMoreTokens())
 				{
 					parameter = st.nextToken(); // clanname|nothing|nothing|level|rep_points
 				}
-				if (action != null)
+				
-				{
 				switch (action)
 				{
-						case create:
+					case "create":
 					{
 						if ((parameter == null) || (parameter.length() == 0))
 						{
@@ -133,7 +122,7 @@ public class AdminPledge implements IAdminCommandHandler
 						showMainPage(activeChar);
 						return false;
 					}
-						case dismiss:
+					case "dismiss":
 					{
 						ClanTable.getInstance().destroyClan(player.getClanId());
 						final Clan clan = player.getClan();
@@ -146,12 +135,12 @@ public class AdminPledge implements IAdminCommandHandler
 						showMainPage(activeChar);
 						return false;
 					}
-						case info:
+					case "info":
 					{
 						activeChar.sendPacket(new GMViewPledgeInfo(player.getClan(), player));
 						return true;
 					}
-						case rep:
+					case "rep":
 					{
 						if (parameter == null)
 						{
@@ -182,7 +171,7 @@ public class AdminPledge implements IAdminCommandHandler
 						BuilderUtil.sendSysMessage(activeChar, "You " + (points > 0 ? "add " : "remove ") + Math.abs(points) + " points " + (points > 0 ? "to " : "from ") + clan.getName() + "'s reputation. Their current score is " + clan.getReputationScore());
 						return true;
 					}
-						case setlevel:
+					case "setlevel":
 					{
 						if (parameter == null)
 						{
@@ -221,15 +210,18 @@ public class AdminPledge implements IAdminCommandHandler
 					}
 				}
 			}
-				return false;
-			}
 			default:
 			{
 				BuilderUtil.sendSysMessage(activeChar, "Clan command not allowed");
 				showMainPage(activeChar);
+			}
+		}
 		return false;
 	}
-		}
+	
+	private void showMainPage(PlayerInstance activeChar)
+	{
+		AdminHelpPage.showHelpPage(activeChar, "game_menu.htm");
 	}
 	
 	@Override
@@ -237,9 +229,4 @@ public class AdminPledge implements IAdminCommandHandler
 	{
 		return ADMIN_COMMANDS;
 	}
-	
-	private void showMainPage(PlayerInstance activeChar)
-	{
-		AdminHelpPage.showHelpPage(activeChar, "game_menu.htm");
-	}
 }

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShutdown.java

@@ -42,26 +42,19 @@ public class AdminShutdown implements IAdminCommandHandler
 		"admin_server_abort"
 	};
 	
-	private enum CommandEnum
-	{
-		admin_server_shutdown,
-		admin_server_restart,
-		admin_server_abort
-	}
-	
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
 		final StringTokenizer st = new StringTokenizer(command);
-		final CommandEnum comm = CommandEnum.valueOf(st.nextToken());
+		final String comm = st.nextToken();
-		if (comm == null)
+		if (command == null)
 		{
 			return false;
 		}
 		
 		switch (comm)
 		{
-			case admin_server_shutdown:
+			case "admin_server_shutdown":
 			{
 				if (st.hasMoreTokens())
 				{
@@ -86,7 +79,7 @@ public class AdminShutdown implements IAdminCommandHandler
 				sendHtmlForm(activeChar);
 				return false;
 			}
-			case admin_server_restart:
+			case "admin_server_restart":
 			{
 				if (st.hasMoreTokens())
 				{
@@ -111,7 +104,7 @@ public class AdminShutdown implements IAdminCommandHandler
 				sendHtmlForm(activeChar);
 				return false;
 			}
-			case admin_server_abort:
+			case "admin_server_abort":
 			{
 				serverAbort(activeChar);
 				return true;
@@ -120,12 +113,6 @@ public class AdminShutdown implements IAdminCommandHandler
 		return false;
 	}
 	
-	@Override
-	public String[] getAdminCommandList()
-	{
-		return ADMIN_COMMANDS;
-	}
-	
 	private void sendHtmlForm(PlayerInstance activeChar)
 	{
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
@@ -156,4 +143,10 @@ public class AdminShutdown implements IAdminCommandHandler
 	{
 		Shutdown.getInstance().abort(activeChar);
 	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
 }

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Repair.java

@@ -48,6 +48,12 @@ public class Repair implements IVoicedCommandHandler, ICustomByPassHandler
 		"repair",
 	};
 	
+	private static final String[] BYPASS_COMMANDS =
+	{
+		"repair",
+		"repair_close_win"
+	};
+	
 	@Override
 	public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target)
 	{
@@ -229,42 +235,17 @@ public class Repair implements IVoicedCommandHandler, ICustomByPassHandler
 		}
 	}
 	
-	@Override
-	public String[] getVoicedCommandList()
-	{
-		return VOICED_COMMANDS;
-	}
-	
-	private static final String[] _BYPASSCMD =
-	{
-		"repair",
-		"repair_close_win"
-	};
-	
-	private enum CommandEnum
-	{
-		repair,
-		repair_close_win
-	}
-	
-	@Override
-	public String[] getByPassCommands()
-	{
-		return _BYPASSCMD;
-	}
-	
 	@Override
 	public void handleCommand(String command, PlayerInstance activeChar, String repairChar)
 	{
-		final CommandEnum comm = CommandEnum.valueOf(command);
+		if (command == null)
-		if (comm == null)
 		{
 			return;
 		}
 		
-		switch (comm)
+		switch (command)
 		{
-			case repair:
+			case "repair":
 			{
 				if ((repairChar == null) || repairChar.equals(""))
 				{
@@ -310,11 +291,23 @@ public class Repair implements IVoicedCommandHandler, ICustomByPassHandler
 				activeChar.sendPacket(npcHtmlMessage);
 				return;
 			}
-			case repair_close_win:
+			case "repair_close_win":
 			{
 				// Do nothing.
 				return;
 			}
 		}
 	}
+	
+	@Override
+	public String[] getVoicedCommandList()
+	{
+		return VOICED_COMMANDS;
+	}
+	
+	@Override
+	public String[] getByPassCommands()
+	{
+		return BYPASS_COMMANDS;
+	}
 }

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/StatsCmd.java

@@ -29,24 +29,17 @@ public class StatsCmd implements IVoicedCommandHandler
 		"stats"
 	};
 	
-	private enum CommandEnum
-	{
-		stat,
-		stats
-	}
-	
 	@Override
 	public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target)
 	{
-		final CommandEnum comm = CommandEnum.valueOf(command);
+		if (command == null)
-		if (comm == null)
 		{
 			return false;
 		}
 		
-		switch (comm)
+		switch (command)
 		{
-			case stat:
+			case "stat":
 			{
 				if (!Config.ALLOW_DETAILED_STATS_VIEW)
 				{
@@ -117,7 +110,7 @@ public class StatsCmd implements IVoicedCommandHandler
 				activeChar.sendPacket(adminReply);
 				return true;
 			}
-			case stats:
+			case "stats":
 			{
 				if (!Config.ALLOW_SIMPLE_STATS_VIEW)
 				{
@@ -138,6 +131,7 @@ public class StatsCmd implements IVoicedCommandHandler
 					activeChar.sendMessage("You can only get the info of a player.");
 					return false;
 				}
+				
 				final PlayerInstance targetp = (PlayerInstance) activeChar.getTarget();
 				if (targetp != null)
 				{
@@ -156,13 +150,12 @@ public class StatsCmd implements IVoicedCommandHandler
 					activeChar.sendPacket(adminReply);
 					return true;
 				}
-				return false;
+				
-			}
-			default:
-			{
 				return false;
 			}
 		}
+		
+		return false;
 	}
 	
 	@Override