From 2ff4a38c760bee519804f201c966d94eba4c86e5 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 30 Nov 2021 23:12:17 +0000
Subject: [PATCH] Using instanceof returns false for nulls.

---
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 .../gameserver/instancemanager/ItemCommissionManager.java      | 3 +--
 21 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 20d23bc7fc..a92f12b620 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 20d23bc7fc..a92f12b620 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 20d23bc7fc..a92f12b620 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 20d23bc7fc..a92f12b620 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 20d23bc7fc..a92f12b620 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 662dbf7c39..acbaab1ea1 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 662dbf7c39..acbaab1ea1 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 662dbf7c39..acbaab1ea1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 662dbf7c39..acbaab1ea1 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 662dbf7c39..acbaab1ea1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 662dbf7c39..acbaab1ea1 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 20d23bc7fc..a92f12b620 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 20d23bc7fc..a92f12b620 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 20d23bc7fc..a92f12b620 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 20d23bc7fc..a92f12b620 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 20d23bc7fc..a92f12b620 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 20d23bc7fc..a92f12b620 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 20d23bc7fc..a92f12b620 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index 20d23bc7fc..a92f12b620 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index b5a0a94918..a588ef79b3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
index b5a0a94918..a588ef79b3 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 /**
  * @author NosBit, Ren
  */
-
 public class ItemCommissionManager
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
 	public static boolean isPlayerAllowedToInteract(Player player)
 	{
 		final Npc npc = player.getLastFolkNPC();
-		if ((npc != null) && (npc instanceof CommissionManager))
+		if (npc instanceof CommissionManager)
 		{
 			return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
 		}