From 88084387a3c0d79123880daec86e177846492851 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 12 Dec 2019 01:40:08 +0000
Subject: [PATCH] Prevent RequestTargetActionMenu when player is targeting
 disabled.

---
 .../network/clientpackets/RequestTargetActionMenu.java          | 2 +-
 .../network/clientpackets/RequestTargetActionMenu.java          | 2 +-
 .../network/clientpackets/RequestTargetActionMenu.java          | 2 +-
 .../network/clientpackets/RequestTargetActionMenu.java          | 2 +-
 .../network/clientpackets/RequestTargetActionMenu.java          | 2 +-
 .../network/clientpackets/RequestTargetActionMenu.java          | 2 +-
 .../network/clientpackets/RequestTargetActionMenu.java          | 2 +-
 .../network/clientpackets/RequestTargetActionMenu.java          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 49d0df5bcd..19cbdbfede 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -41,7 +41,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final PlayerInstance player = client.getPlayer();
-		if (player == null)
+		if ((player == null) || player.isTargetingDisabled())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 49d0df5bcd..19cbdbfede 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -41,7 +41,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final PlayerInstance player = client.getPlayer();
-		if (player == null)
+		if ((player == null) || player.isTargetingDisabled())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 49d0df5bcd..19cbdbfede 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -41,7 +41,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final PlayerInstance player = client.getPlayer();
-		if (player == null)
+		if ((player == null) || player.isTargetingDisabled())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 49d0df5bcd..19cbdbfede 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -41,7 +41,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final PlayerInstance player = client.getPlayer();
-		if (player == null)
+		if ((player == null) || player.isTargetingDisabled())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 49d0df5bcd..19cbdbfede 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -41,7 +41,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final PlayerInstance player = client.getPlayer();
-		if (player == null)
+		if ((player == null) || player.isTargetingDisabled())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 49d0df5bcd..19cbdbfede 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -41,7 +41,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final PlayerInstance player = client.getPlayer();
-		if (player == null)
+		if ((player == null) || player.isTargetingDisabled())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 49d0df5bcd..19cbdbfede 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -41,7 +41,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final PlayerInstance player = client.getPlayer();
-		if (player == null)
+		if ((player == null) || player.isTargetingDisabled())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 49d0df5bcd..19cbdbfede 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -41,7 +41,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final PlayerInstance player = client.getPlayer();
-		if (player == null)
+		if ((player == null) || player.isTargetingDisabled())
 		{
 			return;
 		}