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

Replaced instanceof L2ItemInstance with isItem method.

Browse Source
This commit is contained in:
MobiusDev
2018-06-30 15:41:20 +00:00
parent 94d1362588
commit d806ff66e5
66 changed files with 75 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java
View File

@ -460,7 +460,7 @@ public class L2CharacterAI extends AbstractAI
// Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)
clientStopAutoAttack();
if ((object instanceof L2ItemInstance) && (((L2ItemInstance) object).getItemLocation() != ItemLocation.VOID))
if (object.isItem() && (((L2ItemInstance) object).getItemLocation() != ItemLocation.VOID))
{
return;
}
@ -980,7 +980,7 @@ public class L2CharacterAI extends AbstractAI
}
// while flying there is no move to cast
if (_actor.getAI().getIntention() == AI_INTENTION_CAST && _actor.isPlayer() && _actor.checkTransformed(transform -> !transform.isCombat()))
if ((_actor.getAI().getIntention() == AI_INTENTION_CAST) && _actor.isPlayer() && _actor.checkTransformed(transform -> !transform.isCombat()))
{
_actor.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
_actor.sendPacket(ActionFailed.STATIC_PACKET);

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/TradeList.java
View File

@ -182,7 +182,7 @@ public class TradeList
}
final L2Object o = L2World.getInstance().findObject(objectId);
if (!(o instanceof L2ItemInstance))
if (!o.isItem())
{
LOGGER.warning(_owner.getName() + ": Trying to add something other than an item!");
return null;

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java
View File

@ -482,7 +482,7 @@ public class L2PetInstance extends L2Summon
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
broadcastPacket(new StopMove(this));
if (!(object instanceof L2ItemInstance))
if (!object.isItem())
{
// dont try to pickup anything that is not an item :)
LOGGER_PET.warning(this + " trying to pickup wrong target." + object);

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
View File

@ -266,7 +266,7 @@ public final class L2ItemInstance extends L2Object
* <BR>
* <B><U> Assert </U> :</B><BR>
* <BR>
* <li>this instanceof L2ItemInstance</li>
* <li>this.isItem().</li>
* <li>_worldRegion != null <I>(L2Object is visible at the beginning)</I></li><BR>
* <BR>
* <B><U> Example of use </U> :</B><BR>

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
View File

@ -102,7 +102,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket
if (activeChar.isGM())
{
final L2Object obj = L2World.getInstance().findObject(_objectId);
if (obj instanceof L2ItemInstance)
if (obj.isItem())
{
if (_count > ((L2ItemInstance) obj).getCount())
{

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
View File

@ -41,7 +41,7 @@ public class RequestExRqItemLink implements IClientIncomingPacket
public void run(L2GameClient client)
{
final L2Object object = L2World.getInstance().findObject(_objectId);
if (object instanceof L2ItemInstance)
if (object.isItem())
{
final L2ItemInstance item = (L2ItemInstance) object;
if (item.isPublished())

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@ -94,7 +94,7 @@ public final class UseItem implements IClientIncomingPacket
if (activeChar.isGM())
{
final L2Object obj = L2World.getInstance().findObject(_objectId);
if (obj instanceof L2ItemInstance)
if (obj.isItem())
{
AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_use_item " + _objectId, true);
}