Moved EventDropManager and EventShrineManager to events package.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/EventShrines.java

@@ -19,7 +19,7 @@ package events;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.zone.ZoneType;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java

@@ -114,7 +114,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -142,6 +141,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/events/EventDropManager.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.instancemanager;
+package org.l2jmobius.gameserver.instancemanager.events;
 
 import java.util.List;
 import java.util.Map;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.instancemanager;
+package org.l2jmobius.gameserver.instancemanager.events;
 
 /**
  * @author Mobius

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

@@ -42,9 +42,9 @@ import org.l2jmobius.gameserver.enums.DropType;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.model.AbsorberInfo;
 import org.l2jmobius.gameserver.model.AggroInfo;
 import org.l2jmobius.gameserver.model.CommandChannel;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -39,8 +39,8 @@ import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;

L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/EventShrines.java

@@ -19,7 +19,7 @@ package events;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.zone.ZoneType;

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/GameServer.java

@@ -118,7 +118,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -146,6 +145,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/events/EventDropManager.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.instancemanager;
+package org.l2jmobius.gameserver.instancemanager.events;
 
 import java.util.List;
 import java.util.Map;

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.instancemanager;
+package org.l2jmobius.gameserver.instancemanager.events;
 
 /**
  * @author Mobius

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

@@ -42,9 +42,9 @@ import org.l2jmobius.gameserver.enums.DropType;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.model.AggroInfo;
 import org.l2jmobius.gameserver.model.CommandChannel;
 import org.l2jmobius.gameserver.model.DamageDoneInfo;

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -39,8 +39,8 @@ import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;

L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/EventShrines.java

@@ -19,7 +19,7 @@ package events;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.zone.ZoneType;

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/GameServer.java

@@ -118,7 +118,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -146,6 +145,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/events/EventDropManager.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.instancemanager;
+package org.l2jmobius.gameserver.instancemanager.events;
 
 import java.util.List;
 import java.util.Map;

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.instancemanager;
+package org.l2jmobius.gameserver.instancemanager.events;
 
 /**
  * @author Mobius

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

@@ -42,9 +42,9 @@ import org.l2jmobius.gameserver.enums.DropType;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.model.AggroInfo;
 import org.l2jmobius.gameserver.model.CommandChannel;
 import org.l2jmobius.gameserver.model.DamageDoneInfo;

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -39,8 +39,8 @@ import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/EventShrines.java

@@ -19,7 +19,7 @@ package events;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.zone.ZoneType;

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java

@@ -118,7 +118,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -146,6 +145,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/events/EventDropManager.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.instancemanager;
+package org.l2jmobius.gameserver.instancemanager.events;
 
 import java.util.List;
 import java.util.Map;

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.instancemanager;
+package org.l2jmobius.gameserver.instancemanager.events;
 
 /**
  * @author Mobius

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

@@ -42,9 +42,9 @@ import org.l2jmobius.gameserver.enums.DropType;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.model.AggroInfo;
 import org.l2jmobius.gameserver.model.CommandChannel;
 import org.l2jmobius.gameserver.model.DamageDoneInfo;

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -39,8 +39,8 @@ import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/EventShrines.java

@@ -19,7 +19,7 @@ package events;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.zone.ZoneType;

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java

@@ -120,7 +120,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -148,6 +147,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

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

@@ -1,104 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-import java.util.List;
-import java.util.Map;
-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.Player;
-import org.l2jmobius.gameserver.model.holders.EventDropHolder;
-import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
-
-/**
- * @author Mobius
- */
-public class EventDropManager
-{
-	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
-	
-	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
-	{
-		EVENT_DROPS.put(longTimeEvent, dropList);
-	}
-	
-	public void removeDrops(LongTimeEvent longTimeEvent)
-	{
-		EVENT_DROPS.remove(longTimeEvent);
-	}
-	
-	public void doEventDrop(Creature attacker, Attackable attackable)
-	{
-		if (EVENT_DROPS.isEmpty())
-		{
-			return;
-		}
-		
-		// Event items drop only for players.
-		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
-		{
-			return;
-		}
-		
-		// Event items drop only within a default 9 level difference.
-		final Player player = attacker.getActingPlayer();
-		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
-		{
-			return;
-		}
-		
-		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
-		{
-			DROPS: for (EventDropHolder drop : eventDrops)
-			{
-				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
-				{
-					continue DROPS;
-				}
-				
-				final int monsterLevel = attackable.getLevel();
-				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
-				{
-					final int itemId = drop.getItemId();
-					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
-					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
-					{
-						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
-					}
-					else
-					{
-						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
-					}
-				}
-			}
-		}
-	}
-	
-	public static EventDropManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventDropManager INSTANCE = new EventDropManager();
-	}
-}

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/EventShrineManager.java

@@ -1,45 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-/**
- * @author Mobius
- */
-public class EventShrineManager
-{
-	private static boolean ENABLE_SHRINES = false;
-	
-	public boolean areShrinesEnabled()
-	{
-		return ENABLE_SHRINES;
-	}
-	
-	public void setEnabled(boolean enabled)
-	{
-		ENABLE_SHRINES = enabled;
-	}
-	
-	public static EventShrineManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventShrineManager INSTANCE = new EventShrineManager();
-	}
-}

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/events/EventDropManager.java

@@ -0,0 +1,104 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+import java.util.List;
+import java.util.Map;
+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.Player;
+import org.l2jmobius.gameserver.model.holders.EventDropHolder;
+import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
+
+/**
+ * @author Mobius
+ */
+public class EventDropManager
+{
+	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
+	
+	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
+	{
+		EVENT_DROPS.put(longTimeEvent, dropList);
+	}
+	
+	public void removeDrops(LongTimeEvent longTimeEvent)
+	{
+		EVENT_DROPS.remove(longTimeEvent);
+	}
+	
+	public void doEventDrop(Creature attacker, Attackable attackable)
+	{
+		if (EVENT_DROPS.isEmpty())
+		{
+			return;
+		}
+		
+		// Event items drop only for players.
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
+		{
+			return;
+		}
+		
+		// Event items drop only within a default 9 level difference.
+		final Player player = attacker.getActingPlayer();
+		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
+		{
+			return;
+		}
+		
+		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
+		{
+			DROPS: for (EventDropHolder drop : eventDrops)
+			{
+				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
+				{
+					continue DROPS;
+				}
+				
+				final int monsterLevel = attackable.getLevel();
+				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
+				{
+					final int itemId = drop.getItemId();
+					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
+					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
+					{
+						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
+					}
+					else
+					{
+						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
+					}
+				}
+			}
+		}
+	}
+	
+	public static EventDropManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventDropManager INSTANCE = new EventDropManager();
+	}
+}

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+/**
+ * @author Mobius
+ */
+public class EventShrineManager
+{
+	private static boolean ENABLE_SHRINES = false;
+	
+	public boolean areShrinesEnabled()
+	{
+		return ENABLE_SHRINES;
+	}
+	
+	public void setEnabled(boolean enabled)
+	{
+		ENABLE_SHRINES = enabled;
+	}
+	
+	public static EventShrineManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventShrineManager INSTANCE = new EventShrineManager();
+	}
+}

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

@@ -42,9 +42,9 @@ import org.l2jmobius.gameserver.enums.DropType;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.model.AggroInfo;
 import org.l2jmobius.gameserver.model.CommandChannel;
 import org.l2jmobius.gameserver.model.DamageDoneInfo;

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -39,8 +39,8 @@ import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/EventShrines.java

@@ -19,7 +19,7 @@ package events;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.zone.ZoneType;

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java

@@ -120,7 +120,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -148,6 +147,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

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

@@ -1,104 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-import java.util.List;
-import java.util.Map;
-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.Player;
-import org.l2jmobius.gameserver.model.holders.EventDropHolder;
-import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
-
-/**
- * @author Mobius
- */
-public class EventDropManager
-{
-	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
-	
-	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
-	{
-		EVENT_DROPS.put(longTimeEvent, dropList);
-	}
-	
-	public void removeDrops(LongTimeEvent longTimeEvent)
-	{
-		EVENT_DROPS.remove(longTimeEvent);
-	}
-	
-	public void doEventDrop(Creature attacker, Attackable attackable)
-	{
-		if (EVENT_DROPS.isEmpty())
-		{
-			return;
-		}
-		
-		// Event items drop only for players.
-		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
-		{
-			return;
-		}
-		
-		// Event items drop only within a default 9 level difference.
-		final Player player = attacker.getActingPlayer();
-		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
-		{
-			return;
-		}
-		
-		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
-		{
-			DROPS: for (EventDropHolder drop : eventDrops)
-			{
-				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
-				{
-					continue DROPS;
-				}
-				
-				final int monsterLevel = attackable.getLevel();
-				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
-				{
-					final int itemId = drop.getItemId();
-					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
-					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
-					{
-						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
-					}
-					else
-					{
-						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
-					}
-				}
-			}
-		}
-	}
-	
-	public static EventDropManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventDropManager INSTANCE = new EventDropManager();
-	}
-}

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/EventShrineManager.java

@@ -1,45 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-/**
- * @author Mobius
- */
-public class EventShrineManager
-{
-	private static boolean ENABLE_SHRINES = false;
-	
-	public boolean areShrinesEnabled()
-	{
-		return ENABLE_SHRINES;
-	}
-	
-	public void setEnabled(boolean enabled)
-	{
-		ENABLE_SHRINES = enabled;
-	}
-	
-	public static EventShrineManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventShrineManager INSTANCE = new EventShrineManager();
-	}
-}

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/events/EventDropManager.java

@@ -0,0 +1,104 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+import java.util.List;
+import java.util.Map;
+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.Player;
+import org.l2jmobius.gameserver.model.holders.EventDropHolder;
+import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
+
+/**
+ * @author Mobius
+ */
+public class EventDropManager
+{
+	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
+	
+	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
+	{
+		EVENT_DROPS.put(longTimeEvent, dropList);
+	}
+	
+	public void removeDrops(LongTimeEvent longTimeEvent)
+	{
+		EVENT_DROPS.remove(longTimeEvent);
+	}
+	
+	public void doEventDrop(Creature attacker, Attackable attackable)
+	{
+		if (EVENT_DROPS.isEmpty())
+		{
+			return;
+		}
+		
+		// Event items drop only for players.
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
+		{
+			return;
+		}
+		
+		// Event items drop only within a default 9 level difference.
+		final Player player = attacker.getActingPlayer();
+		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
+		{
+			return;
+		}
+		
+		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
+		{
+			DROPS: for (EventDropHolder drop : eventDrops)
+			{
+				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
+				{
+					continue DROPS;
+				}
+				
+				final int monsterLevel = attackable.getLevel();
+				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
+				{
+					final int itemId = drop.getItemId();
+					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
+					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
+					{
+						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
+					}
+					else
+					{
+						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
+					}
+				}
+			}
+		}
+	}
+	
+	public static EventDropManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventDropManager INSTANCE = new EventDropManager();
+	}
+}

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+/**
+ * @author Mobius
+ */
+public class EventShrineManager
+{
+	private static boolean ENABLE_SHRINES = false;
+	
+	public boolean areShrinesEnabled()
+	{
+		return ENABLE_SHRINES;
+	}
+	
+	public void setEnabled(boolean enabled)
+	{
+		ENABLE_SHRINES = enabled;
+	}
+	
+	public static EventShrineManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventShrineManager INSTANCE = new EventShrineManager();
+	}
+}

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

@@ -42,9 +42,9 @@ import org.l2jmobius.gameserver.enums.DropType;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.model.AggroInfo;
 import org.l2jmobius.gameserver.model.CommandChannel;
 import org.l2jmobius.gameserver.model.DamageDoneInfo;

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -39,8 +39,8 @@ import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/EventShrines.java

@@ -19,7 +19,7 @@ package events;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.zone.ZoneType;

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java

@@ -121,7 +121,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -149,6 +148,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

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

@@ -1,104 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-import java.util.List;
-import java.util.Map;
-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.Player;
-import org.l2jmobius.gameserver.model.holders.EventDropHolder;
-import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
-
-/**
- * @author Mobius
- */
-public class EventDropManager
-{
-	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
-	
-	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
-	{
-		EVENT_DROPS.put(longTimeEvent, dropList);
-	}
-	
-	public void removeDrops(LongTimeEvent longTimeEvent)
-	{
-		EVENT_DROPS.remove(longTimeEvent);
-	}
-	
-	public void doEventDrop(Creature attacker, Attackable attackable)
-	{
-		if (EVENT_DROPS.isEmpty())
-		{
-			return;
-		}
-		
-		// Event items drop only for players.
-		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
-		{
-			return;
-		}
-		
-		// Event items drop only within a default 9 level difference.
-		final Player player = attacker.getActingPlayer();
-		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
-		{
-			return;
-		}
-		
-		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
-		{
-			DROPS: for (EventDropHolder drop : eventDrops)
-			{
-				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
-				{
-					continue DROPS;
-				}
-				
-				final int monsterLevel = attackable.getLevel();
-				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
-				{
-					final int itemId = drop.getItemId();
-					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
-					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
-					{
-						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
-					}
-					else
-					{
-						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
-					}
-				}
-			}
-		}
-	}
-	
-	public static EventDropManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventDropManager INSTANCE = new EventDropManager();
-	}
-}

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/EventShrineManager.java

@@ -1,45 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-/**
- * @author Mobius
- */
-public class EventShrineManager
-{
-	private static boolean ENABLE_SHRINES = false;
-	
-	public boolean areShrinesEnabled()
-	{
-		return ENABLE_SHRINES;
-	}
-	
-	public void setEnabled(boolean enabled)
-	{
-		ENABLE_SHRINES = enabled;
-	}
-	
-	public static EventShrineManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventShrineManager INSTANCE = new EventShrineManager();
-	}
-}

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/events/EventDropManager.java

@@ -0,0 +1,104 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+import java.util.List;
+import java.util.Map;
+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.Player;
+import org.l2jmobius.gameserver.model.holders.EventDropHolder;
+import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
+
+/**
+ * @author Mobius
+ */
+public class EventDropManager
+{
+	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
+	
+	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
+	{
+		EVENT_DROPS.put(longTimeEvent, dropList);
+	}
+	
+	public void removeDrops(LongTimeEvent longTimeEvent)
+	{
+		EVENT_DROPS.remove(longTimeEvent);
+	}
+	
+	public void doEventDrop(Creature attacker, Attackable attackable)
+	{
+		if (EVENT_DROPS.isEmpty())
+		{
+			return;
+		}
+		
+		// Event items drop only for players.
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
+		{
+			return;
+		}
+		
+		// Event items drop only within a default 9 level difference.
+		final Player player = attacker.getActingPlayer();
+		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
+		{
+			return;
+		}
+		
+		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
+		{
+			DROPS: for (EventDropHolder drop : eventDrops)
+			{
+				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
+				{
+					continue DROPS;
+				}
+				
+				final int monsterLevel = attackable.getLevel();
+				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
+				{
+					final int itemId = drop.getItemId();
+					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
+					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
+					{
+						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
+					}
+					else
+					{
+						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
+					}
+				}
+			}
+		}
+	}
+	
+	public static EventDropManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventDropManager INSTANCE = new EventDropManager();
+	}
+}

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+/**
+ * @author Mobius
+ */
+public class EventShrineManager
+{
+	private static boolean ENABLE_SHRINES = false;
+	
+	public boolean areShrinesEnabled()
+	{
+		return ENABLE_SHRINES;
+	}
+	
+	public void setEnabled(boolean enabled)
+	{
+		ENABLE_SHRINES = enabled;
+	}
+	
+	public static EventShrineManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventShrineManager INSTANCE = new EventShrineManager();
+	}
+}

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

@@ -42,9 +42,9 @@ import org.l2jmobius.gameserver.enums.DropType;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.model.AggroInfo;
 import org.l2jmobius.gameserver.model.CommandChannel;
 import org.l2jmobius.gameserver.model.DamageDoneInfo;

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -39,8 +39,8 @@ import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/EventShrines.java

@@ -19,7 +19,7 @@ package events;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.zone.ZoneType;

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java

@@ -123,7 +123,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -152,6 +151,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

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

@@ -1,104 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-import java.util.List;
-import java.util.Map;
-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.Player;
-import org.l2jmobius.gameserver.model.holders.EventDropHolder;
-import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
-
-/**
- * @author Mobius
- */
-public class EventDropManager
-{
-	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
-	
-	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
-	{
-		EVENT_DROPS.put(longTimeEvent, dropList);
-	}
-	
-	public void removeDrops(LongTimeEvent longTimeEvent)
-	{
-		EVENT_DROPS.remove(longTimeEvent);
-	}
-	
-	public void doEventDrop(Creature attacker, Attackable attackable)
-	{
-		if (EVENT_DROPS.isEmpty())
-		{
-			return;
-		}
-		
-		// Event items drop only for players.
-		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
-		{
-			return;
-		}
-		
-		// Event items drop only within a default 9 level difference.
-		final Player player = attacker.getActingPlayer();
-		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
-		{
-			return;
-		}
-		
-		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
-		{
-			DROPS: for (EventDropHolder drop : eventDrops)
-			{
-				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
-				{
-					continue DROPS;
-				}
-				
-				final int monsterLevel = attackable.getLevel();
-				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
-				{
-					final int itemId = drop.getItemId();
-					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
-					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
-					{
-						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
-					}
-					else
-					{
-						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
-					}
-				}
-			}
-		}
-	}
-	
-	public static EventDropManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventDropManager INSTANCE = new EventDropManager();
-	}
-}

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/EventShrineManager.java

@@ -1,45 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-/**
- * @author Mobius
- */
-public class EventShrineManager
-{
-	private static boolean ENABLE_SHRINES = false;
-	
-	public boolean areShrinesEnabled()
-	{
-		return ENABLE_SHRINES;
-	}
-	
-	public void setEnabled(boolean enabled)
-	{
-		ENABLE_SHRINES = enabled;
-	}
-	
-	public static EventShrineManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventShrineManager INSTANCE = new EventShrineManager();
-	}
-}

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/events/EventDropManager.java

@@ -0,0 +1,104 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+import java.util.List;
+import java.util.Map;
+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.Player;
+import org.l2jmobius.gameserver.model.holders.EventDropHolder;
+import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
+
+/**
+ * @author Mobius
+ */
+public class EventDropManager
+{
+	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
+	
+	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
+	{
+		EVENT_DROPS.put(longTimeEvent, dropList);
+	}
+	
+	public void removeDrops(LongTimeEvent longTimeEvent)
+	{
+		EVENT_DROPS.remove(longTimeEvent);
+	}
+	
+	public void doEventDrop(Creature attacker, Attackable attackable)
+	{
+		if (EVENT_DROPS.isEmpty())
+		{
+			return;
+		}
+		
+		// Event items drop only for players.
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
+		{
+			return;
+		}
+		
+		// Event items drop only within a default 9 level difference.
+		final Player player = attacker.getActingPlayer();
+		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
+		{
+			return;
+		}
+		
+		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
+		{
+			DROPS: for (EventDropHolder drop : eventDrops)
+			{
+				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
+				{
+					continue DROPS;
+				}
+				
+				final int monsterLevel = attackable.getLevel();
+				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
+				{
+					final int itemId = drop.getItemId();
+					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
+					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
+					{
+						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
+					}
+					else
+					{
+						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
+					}
+				}
+			}
+		}
+	}
+	
+	public static EventDropManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventDropManager INSTANCE = new EventDropManager();
+	}
+}

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+/**
+ * @author Mobius
+ */
+public class EventShrineManager
+{
+	private static boolean ENABLE_SHRINES = false;
+	
+	public boolean areShrinesEnabled()
+	{
+		return ENABLE_SHRINES;
+	}
+	
+	public void setEnabled(boolean enabled)
+	{
+		ENABLE_SHRINES = enabled;
+	}
+	
+	public static EventShrineManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventShrineManager INSTANCE = new EventShrineManager();
+	}
+}

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

@@ -42,9 +42,9 @@ import org.l2jmobius.gameserver.enums.DropType;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.model.AggroInfo;
 import org.l2jmobius.gameserver.model.CommandChannel;
 import org.l2jmobius.gameserver.model.DamageDoneInfo;

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -39,8 +39,8 @@ import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/EventShrines.java

@@ -19,7 +19,7 @@ package events;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.zone.ZoneType;

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/GameServer.java

@@ -123,7 +123,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -152,6 +151,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -1,104 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-import java.util.List;
-import java.util.Map;
-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.Player;
-import org.l2jmobius.gameserver.model.holders.EventDropHolder;
-import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
-
-/**
- * @author Mobius
- */
-public class EventDropManager
-{
-	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
-	
-	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
-	{
-		EVENT_DROPS.put(longTimeEvent, dropList);
-	}
-	
-	public void removeDrops(LongTimeEvent longTimeEvent)
-	{
-		EVENT_DROPS.remove(longTimeEvent);
-	}
-	
-	public void doEventDrop(Creature attacker, Attackable attackable)
-	{
-		if (EVENT_DROPS.isEmpty())
-		{
-			return;
-		}
-		
-		// Event items drop only for players.
-		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
-		{
-			return;
-		}
-		
-		// Event items drop only within a default 9 level difference.
-		final Player player = attacker.getActingPlayer();
-		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
-		{
-			return;
-		}
-		
-		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
-		{
-			DROPS: for (EventDropHolder drop : eventDrops)
-			{
-				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
-				{
-					continue DROPS;
-				}
-				
-				final int monsterLevel = attackable.getLevel();
-				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
-				{
-					final int itemId = drop.getItemId();
-					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
-					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
-					{
-						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
-					}
-					else
-					{
-						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
-					}
-				}
-			}
-		}
-	}
-	
-	public static EventDropManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventDropManager INSTANCE = new EventDropManager();
-	}
-}

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/EventShrineManager.java

@@ -1,45 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-/**
- * @author Mobius
- */
-public class EventShrineManager
-{
-	private static boolean ENABLE_SHRINES = false;
-	
-	public boolean areShrinesEnabled()
-	{
-		return ENABLE_SHRINES;
-	}
-	
-	public void setEnabled(boolean enabled)
-	{
-		ENABLE_SHRINES = enabled;
-	}
-	
-	public static EventShrineManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventShrineManager INSTANCE = new EventShrineManager();
-	}
-}

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/events/EventDropManager.java

@@ -0,0 +1,104 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+import java.util.List;
+import java.util.Map;
+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.Player;
+import org.l2jmobius.gameserver.model.holders.EventDropHolder;
+import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
+
+/**
+ * @author Mobius
+ */
+public class EventDropManager
+{
+	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
+	
+	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
+	{
+		EVENT_DROPS.put(longTimeEvent, dropList);
+	}
+	
+	public void removeDrops(LongTimeEvent longTimeEvent)
+	{
+		EVENT_DROPS.remove(longTimeEvent);
+	}
+	
+	public void doEventDrop(Creature attacker, Attackable attackable)
+	{
+		if (EVENT_DROPS.isEmpty())
+		{
+			return;
+		}
+		
+		// Event items drop only for players.
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
+		{
+			return;
+		}
+		
+		// Event items drop only within a default 9 level difference.
+		final Player player = attacker.getActingPlayer();
+		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
+		{
+			return;
+		}
+		
+		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
+		{
+			DROPS: for (EventDropHolder drop : eventDrops)
+			{
+				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
+				{
+					continue DROPS;
+				}
+				
+				final int monsterLevel = attackable.getLevel();
+				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
+				{
+					final int itemId = drop.getItemId();
+					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
+					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
+					{
+						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
+					}
+					else
+					{
+						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
+					}
+				}
+			}
+		}
+	}
+	
+	public static EventDropManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventDropManager INSTANCE = new EventDropManager();
+	}
+}

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+/**
+ * @author Mobius
+ */
+public class EventShrineManager
+{
+	private static boolean ENABLE_SHRINES = false;
+	
+	public boolean areShrinesEnabled()
+	{
+		return ENABLE_SHRINES;
+	}
+	
+	public void setEnabled(boolean enabled)
+	{
+		ENABLE_SHRINES = enabled;
+	}
+	
+	public static EventShrineManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventShrineManager INSTANCE = new EventShrineManager();
+	}
+}

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -42,9 +42,9 @@ import org.l2jmobius.gameserver.enums.DropType;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.model.AggroInfo;
 import org.l2jmobius.gameserver.model.CommandChannel;
 import org.l2jmobius.gameserver.model.DamageDoneInfo;

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -39,8 +39,8 @@ import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.instancemanager.events.ItemDeletionInfoManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/EventShrines.java

@@ -19,7 +19,7 @@ package events;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.zone.ZoneType;

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/GameServer.java

@@ -124,7 +124,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -153,6 +152,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -1,104 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-import java.util.List;
-import java.util.Map;
-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.Player;
-import org.l2jmobius.gameserver.model.holders.EventDropHolder;
-import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
-
-/**
- * @author Mobius
- */
-public class EventDropManager
-{
-	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
-	
-	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
-	{
-		EVENT_DROPS.put(longTimeEvent, dropList);
-	}
-	
-	public void removeDrops(LongTimeEvent longTimeEvent)
-	{
-		EVENT_DROPS.remove(longTimeEvent);
-	}
-	
-	public void doEventDrop(Creature attacker, Attackable attackable)
-	{
-		if (EVENT_DROPS.isEmpty())
-		{
-			return;
-		}
-		
-		// Event items drop only for players.
-		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
-		{
-			return;
-		}
-		
-		// Event items drop only within a default 9 level difference.
-		final Player player = attacker.getActingPlayer();
-		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
-		{
-			return;
-		}
-		
-		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
-		{
-			DROPS: for (EventDropHolder drop : eventDrops)
-			{
-				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
-				{
-					continue DROPS;
-				}
-				
-				final int monsterLevel = attackable.getLevel();
-				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
-				{
-					final int itemId = drop.getItemId();
-					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
-					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
-					{
-						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
-					}
-					else
-					{
-						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
-					}
-				}
-			}
-		}
-	}
-	
-	public static EventDropManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventDropManager INSTANCE = new EventDropManager();
-	}
-}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/EventShrineManager.java

@@ -1,45 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-/**
- * @author Mobius
- */
-public class EventShrineManager
-{
-	private static boolean ENABLE_SHRINES = false;
-	
-	public boolean areShrinesEnabled()
-	{
-		return ENABLE_SHRINES;
-	}
-	
-	public void setEnabled(boolean enabled)
-	{
-		ENABLE_SHRINES = enabled;
-	}
-	
-	public static EventShrineManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventShrineManager INSTANCE = new EventShrineManager();
-	}
-}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/events/EventDropManager.java

@@ -0,0 +1,104 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+import java.util.List;
+import java.util.Map;
+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.Player;
+import org.l2jmobius.gameserver.model.holders.EventDropHolder;
+import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
+
+/**
+ * @author Mobius
+ */
+public class EventDropManager
+{
+	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
+	
+	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
+	{
+		EVENT_DROPS.put(longTimeEvent, dropList);
+	}
+	
+	public void removeDrops(LongTimeEvent longTimeEvent)
+	{
+		EVENT_DROPS.remove(longTimeEvent);
+	}
+	
+	public void doEventDrop(Creature attacker, Attackable attackable)
+	{
+		if (EVENT_DROPS.isEmpty())
+		{
+			return;
+		}
+		
+		// Event items drop only for players.
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
+		{
+			return;
+		}
+		
+		// Event items drop only within a default 9 level difference.
+		final Player player = attacker.getActingPlayer();
+		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
+		{
+			return;
+		}
+		
+		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
+		{
+			DROPS: for (EventDropHolder drop : eventDrops)
+			{
+				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
+				{
+					continue DROPS;
+				}
+				
+				final int monsterLevel = attackable.getLevel();
+				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
+				{
+					final int itemId = drop.getItemId();
+					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
+					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
+					{
+						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
+					}
+					else
+					{
+						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
+					}
+				}
+			}
+		}
+	}
+	
+	public static EventDropManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventDropManager INSTANCE = new EventDropManager();
+	}
+}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+/**
+ * @author Mobius
+ */
+public class EventShrineManager
+{
+	private static boolean ENABLE_SHRINES = false;
+	
+	public boolean areShrinesEnabled()
+	{
+		return ENABLE_SHRINES;
+	}
+	
+	public void setEnabled(boolean enabled)
+	{
+		ENABLE_SHRINES = enabled;
+	}
+	
+	public static EventShrineManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventShrineManager INSTANCE = new EventShrineManager();
+	}
+}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -42,9 +42,9 @@ import org.l2jmobius.gameserver.enums.DropType;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.model.AggroInfo;
 import org.l2jmobius.gameserver.model.CommandChannel;
 import org.l2jmobius.gameserver.model.DamageDoneInfo;

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -39,8 +39,8 @@ import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.instancemanager.events.ItemDeletionInfoManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;

L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/EventShrines.java

@@ -19,7 +19,7 @@ package events;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.zone.ZoneType;

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/GameServer.java

@@ -126,7 +126,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -155,6 +154,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -1,104 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-import java.util.List;
-import java.util.Map;
-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.Player;
-import org.l2jmobius.gameserver.model.holders.EventDropHolder;
-import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
-
-/**
- * @author Mobius
- */
-public class EventDropManager
-{
-	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
-	
-	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
-	{
-		EVENT_DROPS.put(longTimeEvent, dropList);
-	}
-	
-	public void removeDrops(LongTimeEvent longTimeEvent)
-	{
-		EVENT_DROPS.remove(longTimeEvent);
-	}
-	
-	public void doEventDrop(Creature attacker, Attackable attackable)
-	{
-		if (EVENT_DROPS.isEmpty())
-		{
-			return;
-		}
-		
-		// Event items drop only for players.
-		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
-		{
-			return;
-		}
-		
-		// Event items drop only within a default 9 level difference.
-		final Player player = attacker.getActingPlayer();
-		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
-		{
-			return;
-		}
-		
-		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
-		{
-			DROPS: for (EventDropHolder drop : eventDrops)
-			{
-				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
-				{
-					continue DROPS;
-				}
-				
-				final int monsterLevel = attackable.getLevel();
-				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
-				{
-					final int itemId = drop.getItemId();
-					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
-					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
-					{
-						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
-					}
-					else
-					{
-						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
-					}
-				}
-			}
-		}
-	}
-	
-	public static EventDropManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventDropManager INSTANCE = new EventDropManager();
-	}
-}

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/EventShrineManager.java

@@ -1,45 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-/**
- * @author Mobius
- */
-public class EventShrineManager
-{
-	private static boolean ENABLE_SHRINES = false;
-	
-	public boolean areShrinesEnabled()
-	{
-		return ENABLE_SHRINES;
-	}
-	
-	public void setEnabled(boolean enabled)
-	{
-		ENABLE_SHRINES = enabled;
-	}
-	
-	public static EventShrineManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventShrineManager INSTANCE = new EventShrineManager();
-	}
-}

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/EventDropManager.java

@@ -0,0 +1,104 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+import java.util.List;
+import java.util.Map;
+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.Player;
+import org.l2jmobius.gameserver.model.holders.EventDropHolder;
+import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
+
+/**
+ * @author Mobius
+ */
+public class EventDropManager
+{
+	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
+	
+	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
+	{
+		EVENT_DROPS.put(longTimeEvent, dropList);
+	}
+	
+	public void removeDrops(LongTimeEvent longTimeEvent)
+	{
+		EVENT_DROPS.remove(longTimeEvent);
+	}
+	
+	public void doEventDrop(Creature attacker, Attackable attackable)
+	{
+		if (EVENT_DROPS.isEmpty())
+		{
+			return;
+		}
+		
+		// Event items drop only for players.
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
+		{
+			return;
+		}
+		
+		// Event items drop only within a default 9 level difference.
+		final Player player = attacker.getActingPlayer();
+		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
+		{
+			return;
+		}
+		
+		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
+		{
+			DROPS: for (EventDropHolder drop : eventDrops)
+			{
+				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
+				{
+					continue DROPS;
+				}
+				
+				final int monsterLevel = attackable.getLevel();
+				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
+				{
+					final int itemId = drop.getItemId();
+					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
+					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
+					{
+						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
+					}
+					else
+					{
+						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
+					}
+				}
+			}
+		}
+	}
+	
+	public static EventDropManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventDropManager INSTANCE = new EventDropManager();
+	}
+}

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+/**
+ * @author Mobius
+ */
+public class EventShrineManager
+{
+	private static boolean ENABLE_SHRINES = false;
+	
+	public boolean areShrinesEnabled()
+	{
+		return ENABLE_SHRINES;
+	}
+	
+	public void setEnabled(boolean enabled)
+	{
+		ENABLE_SHRINES = enabled;
+	}
+	
+	public static EventShrineManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventShrineManager INSTANCE = new EventShrineManager();
+	}
+}

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -42,9 +42,9 @@ import org.l2jmobius.gameserver.enums.DropType;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.model.AggroInfo;
 import org.l2jmobius.gameserver.model.CommandChannel;
 import org.l2jmobius.gameserver.model.DamageDoneInfo;

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -39,8 +39,8 @@ import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.instancemanager.events.ItemDeletionInfoManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/EventShrines.java

@@ -19,7 +19,7 @@ package events;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.zone.ZoneType;

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/GameServer.java

@@ -126,7 +126,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -155,6 +154,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/EventDropManager.java

@@ -1,104 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-import java.util.List;
-import java.util.Map;
-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.Player;
-import org.l2jmobius.gameserver.model.holders.EventDropHolder;
-import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
-
-/**
- * @author Mobius
- */
-public class EventDropManager
-{
-	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
-	
-	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
-	{
-		EVENT_DROPS.put(longTimeEvent, dropList);
-	}
-	
-	public void removeDrops(LongTimeEvent longTimeEvent)
-	{
-		EVENT_DROPS.remove(longTimeEvent);
-	}
-	
-	public void doEventDrop(Creature attacker, Attackable attackable)
-	{
-		if (EVENT_DROPS.isEmpty())
-		{
-			return;
-		}
-		
-		// Event items drop only for players.
-		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
-		{
-			return;
-		}
-		
-		// Event items drop only within a default 9 level difference.
-		final Player player = attacker.getActingPlayer();
-		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
-		{
-			return;
-		}
-		
-		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
-		{
-			DROPS: for (EventDropHolder drop : eventDrops)
-			{
-				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
-				{
-					continue DROPS;
-				}
-				
-				final int monsterLevel = attackable.getLevel();
-				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
-				{
-					final int itemId = drop.getItemId();
-					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
-					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
-					{
-						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
-					}
-					else
-					{
-						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
-					}
-				}
-			}
-		}
-	}
-	
-	public static EventDropManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventDropManager INSTANCE = new EventDropManager();
-	}
-}

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/EventShrineManager.java

@@ -1,45 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-/**
- * @author Mobius
- */
-public class EventShrineManager
-{
-	private static boolean ENABLE_SHRINES = false;
-	
-	public boolean areShrinesEnabled()
-	{
-		return ENABLE_SHRINES;
-	}
-	
-	public void setEnabled(boolean enabled)
-	{
-		ENABLE_SHRINES = enabled;
-	}
-	
-	public static EventShrineManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventShrineManager INSTANCE = new EventShrineManager();
-	}
-}

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/EventDropManager.java

@@ -0,0 +1,104 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+import java.util.List;
+import java.util.Map;
+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.Player;
+import org.l2jmobius.gameserver.model.holders.EventDropHolder;
+import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
+
+/**
+ * @author Mobius
+ */
+public class EventDropManager
+{
+	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
+	
+	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
+	{
+		EVENT_DROPS.put(longTimeEvent, dropList);
+	}
+	
+	public void removeDrops(LongTimeEvent longTimeEvent)
+	{
+		EVENT_DROPS.remove(longTimeEvent);
+	}
+	
+	public void doEventDrop(Creature attacker, Attackable attackable)
+	{
+		if (EVENT_DROPS.isEmpty())
+		{
+			return;
+		}
+		
+		// Event items drop only for players.
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
+		{
+			return;
+		}
+		
+		// Event items drop only within a default 9 level difference.
+		final Player player = attacker.getActingPlayer();
+		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
+		{
+			return;
+		}
+		
+		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
+		{
+			DROPS: for (EventDropHolder drop : eventDrops)
+			{
+				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
+				{
+					continue DROPS;
+				}
+				
+				final int monsterLevel = attackable.getLevel();
+				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
+				{
+					final int itemId = drop.getItemId();
+					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
+					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
+					{
+						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
+					}
+					else
+					{
+						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
+					}
+				}
+			}
+		}
+	}
+	
+	public static EventDropManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventDropManager INSTANCE = new EventDropManager();
+	}
+}

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+/**
+ * @author Mobius
+ */
+public class EventShrineManager
+{
+	private static boolean ENABLE_SHRINES = false;
+	
+	public boolean areShrinesEnabled()
+	{
+		return ENABLE_SHRINES;
+	}
+	
+	public void setEnabled(boolean enabled)
+	{
+		ENABLE_SHRINES = enabled;
+	}
+	
+	public static EventShrineManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventShrineManager INSTANCE = new EventShrineManager();
+	}
+}

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -42,9 +42,9 @@ import org.l2jmobius.gameserver.enums.DropType;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.model.AggroInfo;
 import org.l2jmobius.gameserver.model.CommandChannel;
 import org.l2jmobius.gameserver.model.DamageDoneInfo;

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -39,8 +39,8 @@ import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.instancemanager.events.ItemDeletionInfoManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java

@@ -118,7 +118,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
 import org.l2jmobius.gameserver.instancemanager.GraciaSeedsManager;
@@ -144,6 +143,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

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

@@ -1,104 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-import java.util.List;
-import java.util.Map;
-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.Player;
-import org.l2jmobius.gameserver.model.holders.EventDropHolder;
-import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
-
-/**
- * @author Mobius
- */
-public class EventDropManager
-{
-	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
-	
-	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
-	{
-		EVENT_DROPS.put(longTimeEvent, dropList);
-	}
-	
-	public void removeDrops(LongTimeEvent longTimeEvent)
-	{
-		EVENT_DROPS.remove(longTimeEvent);
-	}
-	
-	public void doEventDrop(Creature attacker, Attackable attackable)
-	{
-		if (EVENT_DROPS.isEmpty())
-		{
-			return;
-		}
-		
-		// Event items drop only for players.
-		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
-		{
-			return;
-		}
-		
-		// Event items drop only within a default 9 level difference.
-		final Player player = attacker.getActingPlayer();
-		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
-		{
-			return;
-		}
-		
-		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
-		{
-			DROPS: for (EventDropHolder drop : eventDrops)
-			{
-				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
-				{
-					continue DROPS;
-				}
-				
-				final int monsterLevel = attackable.getLevel();
-				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
-				{
-					final int itemId = drop.getItemId();
-					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
-					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
-					{
-						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
-					}
-					else
-					{
-						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
-					}
-				}
-			}
-		}
-	}
-	
-	public static EventDropManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventDropManager INSTANCE = new EventDropManager();
-	}
-}

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

@@ -1,45 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-/**
- * @author Mobius
- */
-public class EventShrineManager
-{
-	private static boolean ENABLE_SHRINES = false;
-	
-	public boolean areShrinesEnabled()
-	{
-		return ENABLE_SHRINES;
-	}
-	
-	public void setEnabled(boolean enabled)
-	{
-		ENABLE_SHRINES = enabled;
-	}
-	
-	public static EventShrineManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventShrineManager INSTANCE = new EventShrineManager();
-	}
-}

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

@@ -0,0 +1,104 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+import java.util.List;
+import java.util.Map;
+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.Player;
+import org.l2jmobius.gameserver.model.holders.EventDropHolder;
+import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
+
+/**
+ * @author Mobius
+ */
+public class EventDropManager
+{
+	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
+	
+	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
+	{
+		EVENT_DROPS.put(longTimeEvent, dropList);
+	}
+	
+	public void removeDrops(LongTimeEvent longTimeEvent)
+	{
+		EVENT_DROPS.remove(longTimeEvent);
+	}
+	
+	public void doEventDrop(Creature attacker, Attackable attackable)
+	{
+		if (EVENT_DROPS.isEmpty())
+		{
+			return;
+		}
+		
+		// Event items drop only for players.
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
+		{
+			return;
+		}
+		
+		// Event items drop only within a default 9 level difference.
+		final Player player = attacker.getActingPlayer();
+		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
+		{
+			return;
+		}
+		
+		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
+		{
+			DROPS: for (EventDropHolder drop : eventDrops)
+			{
+				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
+				{
+					continue DROPS;
+				}
+				
+				final int monsterLevel = attackable.getLevel();
+				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
+				{
+					final int itemId = drop.getItemId();
+					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
+					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
+					{
+						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
+					}
+					else
+					{
+						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
+					}
+				}
+			}
+		}
+	}
+	
+	public static EventDropManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventDropManager INSTANCE = new EventDropManager();
+	}
+}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+/**
+ * @author Mobius
+ */
+public class EventShrineManager
+{
+	private static boolean ENABLE_SHRINES = false;
+	
+	public boolean areShrinesEnabled()
+	{
+		return ENABLE_SHRINES;
+	}
+	
+	public void setEnabled(boolean enabled)
+	{
+		ENABLE_SHRINES = enabled;
+	}
+	
+	public static EventShrineManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventShrineManager INSTANCE = new EventShrineManager();
+	}
+}

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

@@ -42,9 +42,9 @@ import org.l2jmobius.gameserver.enums.DropType;
 import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.enums.Team;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.model.AggroInfo;
 import org.l2jmobius.gameserver.model.CommandChannel;
 import org.l2jmobius.gameserver.model.DamageDoneInfo;

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -39,8 +39,8 @@ import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
-import org.l2jmobius.gameserver.instancemanager.EventShrineManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java

@@ -118,7 +118,6 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.CustomMailManager;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.DailyTaskManager;
-import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.FakePlayerChatManager;
 import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
 import org.l2jmobius.gameserver.instancemanager.GraciaSeedsManager;
@@ -144,6 +143,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.WalkingManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.games.MonsterRace;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;

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

@@ -1,104 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-import java.util.List;
-import java.util.Map;
-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.Player;
-import org.l2jmobius.gameserver.model.holders.EventDropHolder;
-import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
-
-/**
- * @author Mobius
- */
-public class EventDropManager
-{
-	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
-	
-	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
-	{
-		EVENT_DROPS.put(longTimeEvent, dropList);
-	}
-	
-	public void removeDrops(LongTimeEvent longTimeEvent)
-	{
-		EVENT_DROPS.remove(longTimeEvent);
-	}
-	
-	public void doEventDrop(Creature attacker, Attackable attackable)
-	{
-		if (EVENT_DROPS.isEmpty())
-		{
-			return;
-		}
-		
-		// Event items drop only for players.
-		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
-		{
-			return;
-		}
-		
-		// Event items drop only within a default 9 level difference.
-		final Player player = attacker.getActingPlayer();
-		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
-		{
-			return;
-		}
-		
-		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
-		{
-			DROPS: for (EventDropHolder drop : eventDrops)
-			{
-				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
-				{
-					continue DROPS;
-				}
-				
-				final int monsterLevel = attackable.getLevel();
-				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
-				{
-					final int itemId = drop.getItemId();
-					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
-					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
-					{
-						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
-					}
-					else
-					{
-						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
-					}
-				}
-			}
-		}
-	}
-	
-	public static EventDropManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventDropManager INSTANCE = new EventDropManager();
-	}
-}

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

@@ -1,45 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.instancemanager;
-
-/**
- * @author Mobius
- */
-public class EventShrineManager
-{
-	private static boolean ENABLE_SHRINES = false;
-	
-	public boolean areShrinesEnabled()
-	{
-		return ENABLE_SHRINES;
-	}
-	
-	public void setEnabled(boolean enabled)
-	{
-		ENABLE_SHRINES = enabled;
-	}
-	
-	public static EventShrineManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
-	private static class SingletonHolder
-	{
-		protected static final EventShrineManager INSTANCE = new EventShrineManager();
-	}
-}

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

@@ -0,0 +1,104 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+import java.util.List;
+import java.util.Map;
+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.Player;
+import org.l2jmobius.gameserver.model.holders.EventDropHolder;
+import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
+
+/**
+ * @author Mobius
+ */
+public class EventDropManager
+{
+	private static final Map<LongTimeEvent, List<EventDropHolder>> EVENT_DROPS = new ConcurrentHashMap<>(1);
+	
+	public void addDrops(LongTimeEvent longTimeEvent, List<EventDropHolder> dropList)
+	{
+		EVENT_DROPS.put(longTimeEvent, dropList);
+	}
+	
+	public void removeDrops(LongTimeEvent longTimeEvent)
+	{
+		EVENT_DROPS.remove(longTimeEvent);
+	}
+	
+	public void doEventDrop(Creature attacker, Attackable attackable)
+	{
+		if (EVENT_DROPS.isEmpty())
+		{
+			return;
+		}
+		
+		// Event items drop only for players.
+		if ((attacker == null) || !attacker.isPlayable() || attackable.isFakePlayer())
+		{
+			return;
+		}
+		
+		// Event items drop only within a default 9 level difference.
+		final Player player = attacker.getActingPlayer();
+		if ((player.getLevel() - attackable.getLevel()) > Config.EVENT_ITEM_MAX_LEVEL_DIFFERENCE)
+		{
+			return;
+		}
+		
+		for (List<EventDropHolder> eventDrops : EVENT_DROPS.values())
+		{
+			DROPS: for (EventDropHolder drop : eventDrops)
+			{
+				if (!drop.getMonsterIds().isEmpty() && !drop.getMonsterIds().contains(attackable.getId()))
+				{
+					continue DROPS;
+				}
+				
+				final int monsterLevel = attackable.getLevel();
+				if ((monsterLevel >= drop.getMinLevel()) && (monsterLevel <= drop.getMaxLevel()) && (Rnd.get(100d) < drop.getChance()))
+				{
+					final int itemId = drop.getItemId();
+					final long itemCount = Rnd.get(drop.getMin(), drop.getMax());
+					if (Config.AUTO_LOOT_ITEM_IDS.contains(itemId) || Config.AUTO_LOOT || attackable.isFlying())
+					{
+						player.doAutoLoot(attackable, itemId, itemCount); // Give the item to the player that has killed the attackable.
+					}
+					else
+					{
+						attackable.dropItem(player, itemId, itemCount); // Drop the item on the ground.
+					}
+				}
+			}
+		}
+	}
+	
+	public static EventDropManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventDropManager INSTANCE = new EventDropManager();
+	}
+}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/events/EventShrineManager.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.instancemanager.events;
+
+/**
+ * @author Mobius
+ */
+public class EventShrineManager
+{
+	private static boolean ENABLE_SHRINES = false;
+	
+	public boolean areShrinesEnabled()
+	{
+		return ENABLE_SHRINES;
+	}
+	
+	public void setEnabled(boolean enabled)
+	{
+		ENABLE_SHRINES = enabled;
+	}
+	
+	public static EventShrineManager getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final EventShrineManager INSTANCE = new EventShrineManager();
+	}
+}