|
@@ -4424,7 +4424,7 @@ public final class L2PcInstance extends L2Playable
|
|
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
|
|
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
|
|
|
|
|
|
// Check if the L2Object to pick up is a L2ItemInstance
|
|
// Check if the L2Object to pick up is a L2ItemInstance
|
|
- if (!(object instanceof L2ItemInstance))
|
|
|
|
|
|
+ if (!(object.isItem()))
|
|
{
|
|
{
|
|
// dont try to pickup anything that is not an item :)
|
|
// dont try to pickup anything that is not an item :)
|
|
_log.warning(this + " trying to pickup wrong target." + getTarget());
|
|
_log.warning(this + " trying to pickup wrong target." + getTarget());
|
|
@@ -4433,12 +4433,7 @@ public final class L2PcInstance extends L2Playable
|
|
|
|
|
|
L2ItemInstance target = (L2ItemInstance) object;
|
|
L2ItemInstance target = (L2ItemInstance) object;
|
|
|
|
|
|
- // Send a Server->Client packet ActionFailed to this L2PcInstance
|
|
|
|
- sendPacket(ActionFailed.STATIC_PACKET);
|
|
|
|
-
|
|
|
|
- // Send a Server->Client packet StopMove to this L2PcInstance
|
|
|
|
- StopMove sm = new StopMove(this);
|
|
|
|
- sendPacket(sm);
|
|
|
|
|
|
+ sendPacket(new StopMove(this));
|
|
|
|
|
|
SystemMessage smsg = null;
|
|
SystemMessage smsg = null;
|
|
synchronized (target)
|
|
synchronized (target)
|
|
@@ -4467,12 +4462,8 @@ public final class L2PcInstance extends L2Playable
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- if (isInvul() && !canOverrideCond(PcCondOverride.ITEM_CONDITIONS))
|
|
|
|
|
|
+ if (isInvisible() && !canOverrideCond(PcCondOverride.ITEM_CONDITIONS))
|
|
{
|
|
{
|
|
- sendPacket(ActionFailed.STATIC_PACKET);
|
|
|
|
- smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1);
|
|
|
|
- smsg.addItemName(target);
|
|
|
|
- sendPacket(smsg);
|
|
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|