diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
index a134fa82b8..e9b8d70e0d 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
@@ -44,7 +44,7 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
 		_active = packet.readC() == 1;
 		_pickUp = packet.readC() == 1;
 		_nextTargetMode = packet.readH();
-		_longRange = packet.readC() == 0;
+		_longRange = packet.readC() != 0;
 		_potionPercent = packet.readD();
 		_respectfulHunting = packet.readC() == 1;
 		return true;
@@ -67,9 +67,13 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
 			return;
 		}
 		
+		player.getAutoPlaySettings().setPickup(_pickUp);
+		player.getAutoPlaySettings().setLongRange(_longRange);
+		player.getAutoPlaySettings().setRespectfulHunting(_respectfulHunting);
+		
 		if (_active)
 		{
-			AutoPlayTaskManager.getInstance().doAutoPlay(player, _pickUp, _longRange, _respectfulHunting);
+			AutoPlayTaskManager.getInstance().doAutoPlay(player);
 		}
 		else
 		{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index e6934fadf3..188c435e27 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -130,7 +130,7 @@ public class AutoPlayTaskManager
 						continue TARGET;
 					}
 					// Check monster target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player && !player.getServitors().containsKey(nearby.getTarget().getObjectId())))
+					if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
 					{
 						continue TARGET;
 					}
@@ -167,12 +167,8 @@ public class AutoPlayTaskManager
 		}, 1000, 1000);
 	}
 	
-	public void doAutoPlay(PlayerInstance player, boolean pickup, boolean longRange, boolean respectfulHunting)
+	public void doAutoPlay(PlayerInstance player)
 	{
-		player.getAutoPlaySettings().setPickup(pickup);
-		player.getAutoPlaySettings().setLongRange(longRange);
-		player.getAutoPlaySettings().setRespectfulHunting(respectfulHunting);
-		
 		if (!PLAYERS.contains(player))
 		{
 			player.onActionRequest();
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
index bef1ef787d..395ae6f372 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
@@ -44,7 +44,7 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
 		_active = packet.readC() == 1;
 		_pickUp = packet.readC() == 1;
 		_nextTargetMode = packet.readH();
-		_longRange = packet.readC() == 0;
+		_longRange = packet.readC() != 0;
 		_potionPercent = packet.readD();
 		packet.readD(); // 272
 		_respectfulHunting = packet.readC() == 1;
@@ -68,9 +68,13 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
 			return;
 		}
 		
+		player.getAutoPlaySettings().setPickup(_pickUp);
+		player.getAutoPlaySettings().setLongRange(_longRange);
+		player.getAutoPlaySettings().setRespectfulHunting(_respectfulHunting);
+		
 		if (_active)
 		{
-			AutoPlayTaskManager.getInstance().doAutoPlay(player, _pickUp, _longRange, _respectfulHunting);
+			AutoPlayTaskManager.getInstance().doAutoPlay(player);
 		}
 		else
 		{
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index e6934fadf3..188c435e27 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -130,7 +130,7 @@ public class AutoPlayTaskManager
 						continue TARGET;
 					}
 					// Check monster target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player && !player.getServitors().containsKey(nearby.getTarget().getObjectId())))
+					if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
 					{
 						continue TARGET;
 					}
@@ -167,12 +167,8 @@ public class AutoPlayTaskManager
 		}, 1000, 1000);
 	}
 	
-	public void doAutoPlay(PlayerInstance player, boolean pickup, boolean longRange, boolean respectfulHunting)
+	public void doAutoPlay(PlayerInstance player)
 	{
-		player.getAutoPlaySettings().setPickup(pickup);
-		player.getAutoPlaySettings().setLongRange(longRange);
-		player.getAutoPlaySettings().setRespectfulHunting(respectfulHunting);
-		
 		if (!PLAYERS.contains(player))
 		{
 			player.onActionRequest();
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
index bef1ef787d..395ae6f372 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
@@ -44,7 +44,7 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
 		_active = packet.readC() == 1;
 		_pickUp = packet.readC() == 1;
 		_nextTargetMode = packet.readH();
-		_longRange = packet.readC() == 0;
+		_longRange = packet.readC() != 0;
 		_potionPercent = packet.readD();
 		packet.readD(); // 272
 		_respectfulHunting = packet.readC() == 1;
@@ -68,9 +68,13 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
 			return;
 		}
 		
+		player.getAutoPlaySettings().setPickup(_pickUp);
+		player.getAutoPlaySettings().setLongRange(_longRange);
+		player.getAutoPlaySettings().setRespectfulHunting(_respectfulHunting);
+		
 		if (_active)
 		{
-			AutoPlayTaskManager.getInstance().doAutoPlay(player, _pickUp, _longRange, _respectfulHunting);
+			AutoPlayTaskManager.getInstance().doAutoPlay(player);
 		}
 		else
 		{
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index e6934fadf3..188c435e27 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -130,7 +130,7 @@ public class AutoPlayTaskManager
 						continue TARGET;
 					}
 					// Check monster target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player && !player.getServitors().containsKey(nearby.getTarget().getObjectId())))
+					if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
 					{
 						continue TARGET;
 					}
@@ -167,12 +167,8 @@ public class AutoPlayTaskManager
 		}, 1000, 1000);
 	}
 	
-	public void doAutoPlay(PlayerInstance player, boolean pickup, boolean longRange, boolean respectfulHunting)
+	public void doAutoPlay(PlayerInstance player)
 	{
-		player.getAutoPlaySettings().setPickup(pickup);
-		player.getAutoPlaySettings().setLongRange(longRange);
-		player.getAutoPlaySettings().setRespectfulHunting(respectfulHunting);
-		
 		if (!PLAYERS.contains(player))
 		{
 			player.onActionRequest();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
index a134fa82b8..e9b8d70e0d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
@@ -44,7 +44,7 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
 		_active = packet.readC() == 1;
 		_pickUp = packet.readC() == 1;
 		_nextTargetMode = packet.readH();
-		_longRange = packet.readC() == 0;
+		_longRange = packet.readC() != 0;
 		_potionPercent = packet.readD();
 		_respectfulHunting = packet.readC() == 1;
 		return true;
@@ -67,9 +67,13 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
 			return;
 		}
 		
+		player.getAutoPlaySettings().setPickup(_pickUp);
+		player.getAutoPlaySettings().setLongRange(_longRange);
+		player.getAutoPlaySettings().setRespectfulHunting(_respectfulHunting);
+		
 		if (_active)
 		{
-			AutoPlayTaskManager.getInstance().doAutoPlay(player, _pickUp, _longRange, _respectfulHunting);
+			AutoPlayTaskManager.getInstance().doAutoPlay(player);
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index e6934fadf3..188c435e27 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -130,7 +130,7 @@ public class AutoPlayTaskManager
 						continue TARGET;
 					}
 					// Check monster target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player && !player.getServitors().containsKey(nearby.getTarget().getObjectId())))
+					if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
 					{
 						continue TARGET;
 					}
@@ -167,12 +167,8 @@ public class AutoPlayTaskManager
 		}, 1000, 1000);
 	}
 	
-	public void doAutoPlay(PlayerInstance player, boolean pickup, boolean longRange, boolean respectfulHunting)
+	public void doAutoPlay(PlayerInstance player)
 	{
-		player.getAutoPlaySettings().setPickup(pickup);
-		player.getAutoPlaySettings().setLongRange(longRange);
-		player.getAutoPlaySettings().setRespectfulHunting(respectfulHunting);
-		
 		if (!PLAYERS.contains(player))
 		{
 			player.onActionRequest();
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
index bef1ef787d..395ae6f372 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
@@ -44,7 +44,7 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
 		_active = packet.readC() == 1;
 		_pickUp = packet.readC() == 1;
 		_nextTargetMode = packet.readH();
-		_longRange = packet.readC() == 0;
+		_longRange = packet.readC() != 0;
 		_potionPercent = packet.readD();
 		packet.readD(); // 272
 		_respectfulHunting = packet.readC() == 1;
@@ -68,9 +68,13 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
 			return;
 		}
 		
+		player.getAutoPlaySettings().setPickup(_pickUp);
+		player.getAutoPlaySettings().setLongRange(_longRange);
+		player.getAutoPlaySettings().setRespectfulHunting(_respectfulHunting);
+		
 		if (_active)
 		{
-			AutoPlayTaskManager.getInstance().doAutoPlay(player, _pickUp, _longRange, _respectfulHunting);
+			AutoPlayTaskManager.getInstance().doAutoPlay(player);
 		}
 		else
 		{
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index e6934fadf3..188c435e27 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -130,7 +130,7 @@ public class AutoPlayTaskManager
 						continue TARGET;
 					}
 					// Check monster target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player && !player.getServitors().containsKey(nearby.getTarget().getObjectId())))
+					if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
 					{
 						continue TARGET;
 					}
@@ -167,12 +167,8 @@ public class AutoPlayTaskManager
 		}, 1000, 1000);
 	}
 	
-	public void doAutoPlay(PlayerInstance player, boolean pickup, boolean longRange, boolean respectfulHunting)
+	public void doAutoPlay(PlayerInstance player)
 	{
-		player.getAutoPlaySettings().setPickup(pickup);
-		player.getAutoPlaySettings().setLongRange(longRange);
-		player.getAutoPlaySettings().setRespectfulHunting(respectfulHunting);
-		
 		if (!PLAYERS.contains(player))
 		{
 			player.onActionRequest();
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
index bef1ef787d..395ae6f372 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
@@ -44,7 +44,7 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
 		_active = packet.readC() == 1;
 		_pickUp = packet.readC() == 1;
 		_nextTargetMode = packet.readH();
-		_longRange = packet.readC() == 0;
+		_longRange = packet.readC() != 0;
 		_potionPercent = packet.readD();
 		packet.readD(); // 272
 		_respectfulHunting = packet.readC() == 1;
@@ -68,9 +68,13 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
 			return;
 		}
 		
+		player.getAutoPlaySettings().setPickup(_pickUp);
+		player.getAutoPlaySettings().setLongRange(_longRange);
+		player.getAutoPlaySettings().setRespectfulHunting(_respectfulHunting);
+		
 		if (_active)
 		{
-			AutoPlayTaskManager.getInstance().doAutoPlay(player, _pickUp, _longRange, _respectfulHunting);
+			AutoPlayTaskManager.getInstance().doAutoPlay(player);
 		}
 		else
 		{
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index e6934fadf3..188c435e27 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -130,7 +130,7 @@ public class AutoPlayTaskManager
 						continue TARGET;
 					}
 					// Check monster target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player && !player.getServitors().containsKey(nearby.getTarget().getObjectId())))
+					if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
 					{
 						continue TARGET;
 					}
@@ -167,12 +167,8 @@ public class AutoPlayTaskManager
 		}, 1000, 1000);
 	}
 	
-	public void doAutoPlay(PlayerInstance player, boolean pickup, boolean longRange, boolean respectfulHunting)
+	public void doAutoPlay(PlayerInstance player)
 	{
-		player.getAutoPlaySettings().setPickup(pickup);
-		player.getAutoPlaySettings().setLongRange(longRange);
-		player.getAutoPlaySettings().setRespectfulHunting(respectfulHunting);
-		
 		if (!PLAYERS.contains(player))
 		{
 			player.onActionRequest();