BETA: Minor changes to some listeners based on #6129 report.

L2J_Server_BETA/java/com/l2jserver/gameserver/model/Location.java

@@ -16,12 +16,6 @@ package com.l2jserver.gameserver.model;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 
-/**
- * This class ...
- *
- * @version $Revision: 1.1.4.1 $ $Date: 2005/03/27 15:29:33 $
- */
-
 public final class Location
 {
 	private final int _x;
@@ -96,4 +90,10 @@ public final class Location
 	{
 		return _instanceId;
 	}
+	
+	@Override
+	public String toString()
+	{
+		return "[" + getClass().getSimpleName() + "] X: " + _x + " Y: " + _y + " Z: " + _z + " Heading: " + _heading +  " InstanceId: " + _instanceId;
+	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/position/ObjectPosition.java

@@ -88,7 +88,7 @@ public class ObjectPosition
 	 * <BR>
 	 * <B><U> Concept</U> :</B><BR>
 	 * <BR>
-	 * A L2Object is invisble if <B>_hidden</B>=true or <B>_worldregion</B>==null <BR>
+	 * A L2Object is invisible if <B>_hidden</B>=true or <B>_worldregion</B>==null <BR>
 	 * <BR>
 	 * <B><U> Assert </U> :</B><BR>
 	 * <BR>
@@ -126,7 +126,7 @@ public class ObjectPosition
 	}
 	
 	/**
-	 * checks if current object changed its region, if so, update referencies
+	 * checks if current object changed its region, if so, update references
 	 */
 	public void updateWorldRegion()
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java

@@ -1005,9 +1005,7 @@ public class PcInventory extends Inventory
 					ItemDropEvent event = new ItemDropEvent();
 					event.setItem(item);
 					event.setDropper(actor);
-					event.setX(actor.getX());
-					event.setY(actor.getY());
-					event.setZ(actor.getZ());
+					event.setLocation(actor.getLocation());
 					for (ItemTracker tracker : itemTrackers)
 					{
 						if (tracker.containsItemId(item.getItemId()))

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java

@@ -1610,7 +1610,7 @@ public final class L2ItemInstance extends L2Object
 			_itm.setDropTime(System.currentTimeMillis());
 			_itm.setDropperObjectId(_dropper != null ? _dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 			
-			// this can synchronize on others instancies, so it's out of
+			// this can synchronize on others instances, so it's out of
 			// synchronized, to avoid deadlocks
 			// Add the L2ItemInstance dropped in the world as a visible object
 			L2World.getInstance().addVisibleObject(_itm, _itm.getPosition().getWorldRegion());
@@ -1622,7 +1622,7 @@ public final class L2ItemInstance extends L2Object
 	
 	public final void dropMe(L2Character dropper, int x, int y, int z)
 	{
-		if ((dropper != null) && !fireDropListeners(dropper.getActingPlayer(), x, y, z))
+		if (!fireDropListeners(dropper, new Location(x, y, z)))
 		{
 			return;
 		}
@@ -2078,9 +2078,7 @@ public final class L2ItemInstance extends L2Object
 			ItemPickupEvent event = new ItemPickupEvent();
 			event.setItem(this);
 			event.setPicker(actor);
-			event.setX(getPosition().getX());
-			event.setY(getPosition().getY());
-			event.setZ(getPosition().getZ());
+			event.setLocation(new Location(getPosition().getX(), getPosition().getY(), getPosition().getZ()));
 			for (DropListener listener : dropListeners)
 			{
 				if (!listener.onPickup(event))
@@ -2123,20 +2121,20 @@ public final class L2ItemInstance extends L2Object
 		return true;
 	}
 	
-	private boolean fireDropListeners(L2PcInstance dropper, int x, int y, int z)
+	private boolean fireDropListeners(L2Character dropper, Location loc)
 	{
-		if (!dropListeners.isEmpty() && dropper != null && dropper.isPlayer())
+		if (!dropListeners.isEmpty() && (dropper != null))
 		{
 			ItemDropEvent event = new ItemDropEvent();
 			event.setDropper(dropper);
 			event.setItem(this);
-			event.setX(x);
-			event.setY(y);
-			event.setZ(z);
+			event.setLocation(loc);
 			for (DropListener listener : dropListeners)
 			{
 				if (!listener.onDrop(event))
+				{
 					return false;
+				}
 			}
 		}
 		return true;

L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ItemDropEvent.java

@@ -14,7 +14,8 @@
  */
 package com.l2jserver.gameserver.scripting.scriptengine.events;
 
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
@@ -24,10 +25,8 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 public class ItemDropEvent implements L2Event
 {
 	private L2ItemInstance item;
-	private L2PcInstance dropper;
-	private int x;
-	private int y;
-	private int z;
+	private L2Character dropper;
+	private Location loc;
 	
 	/**
 	 * @return the item
@@ -38,74 +37,42 @@ public class ItemDropEvent implements L2Event
 	}
 	
 	/**
-	 * @param item the item to set
+	 * @param i the item to set
 	 */
-	public void setItem(L2ItemInstance item)
+	public void setItem(L2ItemInstance i)
 	{
-		this.item = item;
+		item = i;
 	}
 	
 	/**
 	 * @return the dropper
 	 */
-	public L2PcInstance getDropper()
+	public L2Character getDropper()
 	{
 		return dropper;
 	}
 	
 	/**
-	 * @param dropper the dropper to set
+	 * @param d the dropper to set
 	 */
-	public void setDropper(L2PcInstance dropper)
+	public void setDropper(L2Character d)
 	{
-		this.dropper = dropper;
+		dropper = d;
 	}
 	
 	/**
-	 * @return the x
+	 * @return the location where the item was dropped.
 	 */
-	public int getX()
+	public Location getLocation()
 	{
-		return x;
+		return loc;
 	}
 	
 	/**
-	 * @param x the x to set
+	 * @param l the location to to set
 	 */
-	public void setX(int x)
+	public void setLocation(Location l)
 	{
-		this.x = x;
-	}
-	
-	/**
-	 * @return the y
-	 */
-	public int getY()
-	{
-		return y;
-	}
-	
-	/**
-	 * @param y the y to set
-	 */
-	public void setY(int y)
-	{
-		this.y = y;
-	}
-	
-	/**
-	 * @return the z
-	 */
-	public int getZ()
-	{
-		return z;
-	}
-	
-	/**
-	 * @param z the z to set
-	 */
-	public void setZ(int z)
-	{
-		this.z = z;
+		loc = l;
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/events/ItemPickupEvent.java

@@ -14,7 +14,8 @@
  */
 package com.l2jserver.gameserver.scripting.scriptengine.events;
 
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 
@@ -24,10 +25,8 @@ import com.l2jserver.gameserver.scripting.scriptengine.events.impl.L2Event;
 public class ItemPickupEvent implements L2Event
 {
 	private L2ItemInstance item;
-	private L2PcInstance picker;
-	private int x;
-	private int y;
-	private int z;
+	private L2Character picker;
+	private Location loc;
 	
 	/**
 	 * @return the item
@@ -38,74 +37,42 @@ public class ItemPickupEvent implements L2Event
 	}
 	
 	/**
-	 * @param item the item to set
+	 * @param i the item to set
 	 */
-	public void setItem(L2ItemInstance item)
+	public void setItem(L2ItemInstance i)
 	{
-		this.item = item;
+		item = i;
 	}
 	
 	/**
 	 * @return the picker
 	 */
-	public L2PcInstance getPicker()
+	public L2Character getPicker()
 	{
 		return picker;
 	}
 	
 	/**
-	 * @param picker the picker to set
+	 * @param p the picker to set
 	 */
-	public void setPicker(L2PcInstance picker)
+	public void setPicker(L2Character p)
 	{
-		this.picker = picker;
+		picker = p;
 	}
 	
 	/**
-	 * @return the x
+	 * @return the location where the item was picked up.
 	 */
-	public int getX()
+	public Location getLocation()
 	{
-		return x;
+		return loc;
 	}
 	
 	/**
-	 * @param x the x to set
+	 * @param l the location to to set
 	 */
-	public void setX(int x)
+	public void setLocation(Location l)
 	{
-		this.x = x;
-	}
-	
-	/**
-	 * @return the y
-	 */
-	public int getY()
-	{
-		return y;
-	}
-	
-	/**
-	 * @param y the y to set
-	 */
-	public void setY(int y)
-	{
-		this.y = y;
-	}
-	
-	/**
-	 * @return the z
-	 */
-	public int getZ()
-	{
-		return z;
-	}
-	
-	/**
-	 * @param z the z to set
-	 */
-	public void setZ(int z)
-	{
-		this.z = z;
+		loc = l;
 	}
 }