Advertisement
Nik

Pet pickup in party fix.

Nik
Jul 24th, 2012
39
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.43 KB | None | 0 0
  1. Index: java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java
  2. ===================================================================
  3. --- java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java   (revision 5522)
  4. +++ java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java   (working copy)
  5. @@ -40,6 +40,7 @@
  6.  import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
  7.  import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager;
  8.  import com.l2jserver.gameserver.model.L2Object;
  9. +import com.l2jserver.gameserver.model.L2Party;
  10.  import com.l2jserver.gameserver.model.L2PetData;
  11.  import com.l2jserver.gameserver.model.L2PetLevelData;
  12.  import com.l2jserver.gameserver.model.L2World;
  13. @@ -565,7 +566,11 @@
  14.             if (target.getItemLootShedule() != null && (target.getOwnerId() == getOwner().getObjectId() || getOwner().isInLooterParty(target.getOwnerId())))
  15.                 target.resetOwnerTimer();
  16.            
  17. -           target.pickupMe(this);
  18. +           // If owner is in party and it isnt finders keepers, distribute the item instead of stealing it -.-
  19. +           if (getOwner().isInParty() && getOwner().getParty().getLootDistribution() != L2Party.ITEM_LOOTER)
  20. +               getOwner().getParty().distributeItem(getOwner(), target);
  21. +           else
  22. +               target.pickupMe(this);
  23.            
  24.             if (Config.SAVE_DROPPED_ITEM) // item must be removed from ItemsOnGroundManager if is active
  25.                 ItemsOnGroundManager.getInstance().removeObject(target);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement