Changed doEventDrop method attacker parameter to Creature.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -516,7 +516,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -512,7 +512,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -512,7 +512,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -512,7 +512,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -511,7 +511,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -511,7 +511,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -511,7 +511,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -511,7 +511,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -511,7 +511,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -511,7 +511,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -511,7 +511,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -486,7 +486,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -486,7 +486,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -512,7 +512,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -512,7 +512,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -512,7 +512,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -514,7 +514,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -514,7 +514,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -514,7 +514,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -516,7 +516,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -515,7 +515,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -520,7 +520,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -44,7 +45,7 @@ public class EventDropManager
 		EVENT_DROPS.remove(longTimeEvent);
 	}
 	
-	public void doEventDrop(PlayerInstance player, Attackable attackable)
+	public void doEventDrop(Creature attacker, Attackable attackable)
 	{
 		if (EVENT_DROPS.isEmpty())
 		{
@@ -52,12 +53,13 @@ public class EventDropManager
 		}
 		
 		// Event items drop only for players.
-		if ((player == null) || attackable.isFakePlayer())
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
 		{
 			return;
 		}
 		
 		// Event items drop only within a 9 level difference.
+		final PlayerInstance player = attacker.getActingPlayer();
 		if ((player.getLevel() - attackable.getLevel()) > 9)
 		{
 			return;

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -520,7 +520,7 @@ public class Attackable extends Npc
 			else
 			{
 				doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
-				EventDropManager.getInstance().doEventDrop(lastAttacker.getActingPlayer(), this);
+				EventDropManager.getInstance().doEventDrop(lastAttacker, this);
 			}
 			
 			if (!getMustRewardExpSP())