From d229e3a5509bce4f314bce45dc833f486c79e8bd Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 4 Nov 2020 17:33:22 +0000 Subject: [PATCH] Moved clanhall related classes to appropriate packages. --- .../ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java | 4 ++-- .../gameserver/instancemanager/ClanHallAuctionManager.java | 2 +- .../model/{clanhallauction => residences}/Bidder.java | 2 +- .../gameserver/model/residences}/ClanHallAuction.java | 3 +-- .../ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java | 6 +++--- .../ai/others/ClanHallDoorManager/ClanHallDoorManager.java | 2 +- .../scripts/ai/others/ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ProvisionalHalls/ProvisionalHalls.java | 2 +- .../scripts/handlers/actionhandlers/DoorInstanceAction.java | 2 +- .../actionshifthandlers/DoorInstanceActionShift.java | 2 +- .../handlers/actionshifthandlers/NpcActionShift.java | 2 +- .../handlers/admincommandhandlers/AdminClanHall.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../java/org/l2jmobius/gameserver/data/sql/ClanTable.java | 2 +- .../org/l2jmobius/gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/instancemanager/ClanHallAuctionManager.java | 2 +- .../gameserver/instancemanager/MapRegionManager.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Npc.java | 2 +- .../model/{clanhallauction => residences}/Bidder.java | 2 +- .../gameserver/model/{olympiad => residences}/ClanHall.java | 3 +-- .../gameserver/model/residences}/ClanHallAuction.java | 3 +-- .../l2jmobius/gameserver/model/zone/type/ClanHallZone.java | 2 +- .../gameserver/network/clientpackets/EnterWorld.java | 2 +- .../network/clientpackets/RequestRestartPoint.java | 2 +- .../gameserver/network/serverpackets/ExShowAgitInfo.java | 2 +- 25 files changed, 28 insertions(+), 31 deletions(-) rename L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/{clanhallauction => residences}/Bidder.java (92%) rename {L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clanhallauction => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences}/ClanHallAuction.java (94%) rename L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/{clanhallauction => residences}/Bidder.java (92%) rename L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/{olympiad => residences}/ClanHall.java (95%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clanhallauction => L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences}/ClanHallAuction.java (94%) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 137a39ce78..a7e5e42043 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -32,15 +32,15 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.clanhallauction.Bidder; -import org.l2jmobius.gameserver.model.clanhallauction.ClanHallAuction; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.html.formatters.BypassParserFormatter; import org.l2jmobius.gameserver.model.html.pagehandlers.NextPrevPageHandler; import org.l2jmobius.gameserver.model.html.styles.ButtonsStyle; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.residences.Bidder; import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHallAuction; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BypassParser; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index fd4c86c7e9..380d97e557 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -23,10 +23,10 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clanhallauction.ClanHallAuction; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.ScheduleTarget; +import org.l2jmobius.gameserver.model.residences.ClanHallAuction; /** * @author Sdw diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/Bidder.java similarity index 92% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/Bidder.java index 24b8576a12..f4d30762c2 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/Bidder.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.clanhallauction; +package org.l2jmobius.gameserver.model.residences; import java.time.Instant; import java.time.ZoneId; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java similarity index 94% rename from L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index ac7aed559c..2fa683814d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.clanhallauction; +package org.l2jmobius.gameserver.model.residences; import java.sql.Connection; import java.sql.PreparedStatement; @@ -35,7 +35,6 @@ import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; /** * @author Sdw diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 6de65233b2..8eb06bae3d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -32,15 +32,15 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.clanhallauction.Bidder; -import org.l2jmobius.gameserver.model.clanhallauction.ClanHallAuction; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.html.formatters.BypassParserFormatter; import org.l2jmobius.gameserver.model.html.pagehandlers.NextPrevPageHandler; import org.l2jmobius.gameserver.model.html.styles.ButtonsStyle; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; +import org.l2jmobius.gameserver.model.residences.Bidder; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHallAuction; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BypassParser; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java index 851bab6f0f..b73a819176 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java @@ -21,7 +21,7 @@ import java.util.StringTokenizer; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 28b68d1cfe..ba098ab917 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index e1a7112407..f469c39159 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java index 74e93b291d..d4c850f564 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.DoorRequestHolder; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; public class DoorInstanceAction implements IActionHandler diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java index deffb451cf..b4d3c2a645 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index bf445f9ff8..27c1e2cd73 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java index 58c66ee3e9..de7b086fb5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.html.formatters.BypassParserFormatter; import org.l2jmobius.gameserver.model.html.pagehandlers.NextPrevPageHandler; import org.l2jmobius.gameserver.model.html.styles.ButtonsStyle; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 0e598a1872..35b27840c0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 66bc18eade..4e4da8df06 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.clan.OnClanWarFinish; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanCreate; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanDestroy; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.siege.Siege; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java index df4f9af7ad..283e2f0116 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; /** * @author St3eT diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index fd4c86c7e9..380d97e557 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -23,10 +23,10 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clanhallauction.ClanHallAuction; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.ScheduleTarget; +import org.l2jmobius.gameserver.model.residences.ClanHallAuction; /** * @author Sdw diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java index 9c53998741..920d974e48 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.zone.type.RespawnZone; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java index 7d757eaaba..62f1d1049f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -75,9 +75,9 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/Bidder.java similarity index 92% rename from L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java rename to L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/Bidder.java index 24b8576a12..f4d30762c2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/Bidder.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.clanhallauction; +package org.l2jmobius.gameserver.model.residences; import java.time.Instant; import java.time.ZoneId; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/ClanHall.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHall.java similarity index 95% rename from L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/ClanHall.java rename to L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index 306b585dc0..a292c439e5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/ClanHall.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.olympiad; +package org.l2jmobius.gameserver.model.residences; import java.sql.Connection; import java.sql.PreparedStatement; @@ -42,7 +42,6 @@ import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.residences.AbstractResidence; import org.l2jmobius.gameserver.model.zone.type.ClanHallZone; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java similarity index 94% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java rename to L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index 03ed8d9158..2fa683814d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.clanhallauction; +package org.l2jmobius.gameserver.model.residences; import java.sql.Connection; import java.sql.PreparedStatement; @@ -35,7 +35,6 @@ import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.residences.ClanHall; /** * @author Sdw diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java index 59e1ff5017..354d6d853d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.zone.ZoneId; /** diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index c1498f2c8e..f977c87a8f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -53,8 +53,8 @@ import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.siege.Siege; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 2e72da80d6..30e0b1b097 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.listeners.AbstractEventListener; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; import org.l2jmobius.gameserver.model.quest.Event; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index aa92a049d9..82554fdc5f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; -import org.l2jmobius.gameserver.model.olympiad.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.network.OutgoingPackets; /**