lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using instanceof returns false for nulls.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-11-30 23:12:17 +00:00
parent 576fed4bb6
commit 2ff4a38c76
21 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }

3
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java
View File

@@ -58,7 +58,6 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
/** /**
* @author NosBit, Ren * @author NosBit, Ren
*/ */
public class ItemCommissionManager public class ItemCommissionManager
{ {
private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(ItemCommissionManager.class.getName());
@@ -519,7 +518,7 @@ public class ItemCommissionManager
public static boolean isPlayerAllowedToInteract(Player player) public static boolean isPlayerAllowedToInteract(Player player)
{ {
final Npc npc = player.getLastFolkNPC(); final Npc npc = player.getLastFolkNPC();
if ((npc != null) && (npc instanceof CommissionManager)) if (npc instanceof CommissionManager)
{ {
return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE; return npc.calculateDistance3D(player) <= INTERACTION_DISTANCE;
} }