Additional voiced commands for auto potions.

L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_2.5_Underground/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_3.0_Helios/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_4.0_GrandCrusade/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_5.0_Salvation/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_5.5_EtinasFate/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_6.0_Fafurion/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_C6_Interlude/dist/game/config/custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

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

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;

L2J_Mobius_Classic_Interlude/dist/game/config/Custom/AutoPotions.ini

@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------
 # Auto Potion Settings
 # ---------------------------------------------------------------------------
-# Use .apon / .apoff voiced commands to enable / disable.
+# Use .apon / .apoff or .potionon / .potionoff commands to enable / disable.
 
 # Enable auto potion commands.
 AutoPotionsEnabled = false

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java

@@ -29,7 +29,9 @@ public class AutoPotion implements IVoicedCommandHandler
 	private static final String[] VOICED_COMMANDS =
 	{
 		"apon",
-		"apoff"
+		"apoff",
+		"potionon",
+		"potionoff"
 	};
 	
 	@Override
@@ -45,15 +47,22 @@ public class AutoPotion implements IVoicedCommandHandler
 			return false;
 		}
 		
-		if (command.equals("apon"))
+		switch (command)
 		{
-			AutoPotionTaskManager.getInstance().add(activeChar);
+			case "apon":
-			activeChar.sendMessage("Auto potions is enabled.");
+			case "potionon":
-		}
+			{
-		else if (command.equals("apoff"))
+				AutoPotionTaskManager.getInstance().add(activeChar);
-		{
+				activeChar.sendMessage("Auto potions is enabled.");
-			AutoPotionTaskManager.getInstance().remove(activeChar);
+				break;
-			activeChar.sendMessage("Auto potions is disabled.");
+			}
+			case "apoff":
+			case "potionoff":
+			{
+				AutoPotionTaskManager.getInstance().remove(activeChar);
+				activeChar.sendMessage("Auto potions is disabled.");
+				break;
+			}
 		}
 		
 		return true;