From 65b3f4cc1dca4d4a689ccdab08238d7d3e6242bf Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 25 Jan 2020 05:24:45 +0000 Subject: [PATCH] Party match classes moved to partymatching package. --- .../java/org/l2jmobius/gameserver/GameServer.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/Party.java | 2 ++ .../gameserver/model/actor/instance/PlayerInstance.java | 6 +++--- .../model/{ => partymatching}/PartyMatchRoom.java | 2 +- .../model/{ => partymatching}/PartyMatchRoomList.java | 2 +- .../model/{ => partymatching}/PartyMatchWaitingList.java | 2 +- .../network/clientpackets/AnswerJoinPartyRoom.java | 6 +++--- .../network/clientpackets/RequestAnswerJoinParty.java | 4 ++-- .../network/clientpackets/RequestDismissPartyRoom.java | 4 ++-- .../clientpackets/RequestExitPartyMatchingWaitingRoom.java | 2 +- .../network/clientpackets/RequestOustFromPartyRoom.java | 6 +++--- .../network/clientpackets/RequestPartyMatchConfig.java | 6 +++--- .../network/clientpackets/RequestPartyMatchDetail.java | 6 +++--- .../network/clientpackets/RequestPartyMatchList.java | 6 +++--- .../network/clientpackets/RequestWithDrawalParty.java | 4 ++-- .../network/clientpackets/RequestWithdrawPartyRoom.java | 4 ++-- .../serverpackets/ExListPartyMatchingWaitingRoom.java | 6 +++--- .../network/serverpackets/ExManagePartyRoomMember.java | 2 +- .../gameserver/network/serverpackets/ExPartyRoomMember.java | 2 +- .../gameserver/network/serverpackets/PartyMatchDetail.java | 2 +- .../gameserver/network/serverpackets/PartyMatchList.java | 4 ++-- .../scripts/handlers/chathandlers/ChatPartyMatchRoom.java | 4 ++-- .../java/org/l2jmobius/gameserver/GameServer.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/Party.java | 1 + .../gameserver/model/actor/instance/PlayerInstance.java | 6 +++--- .../gameserver/model/partymatching}/PartyMatchRoom.java | 2 +- .../gameserver/model/partymatching}/PartyMatchRoomList.java | 2 +- .../model/partymatching}/PartyMatchWaitingList.java | 2 +- .../network/clientpackets/AnswerJoinPartyRoom.java | 6 +++--- .../network/clientpackets/RequestAnswerJoinParty.java | 4 ++-- .../network/clientpackets/RequestDismissPartyRoom.java | 4 ++-- .../clientpackets/RequestExitPartyMatchingWaitingRoom.java | 2 +- .../network/clientpackets/RequestOustFromPartyRoom.java | 6 +++--- .../network/clientpackets/RequestPartyMatchConfig.java | 6 +++--- .../network/clientpackets/RequestPartyMatchDetail.java | 6 +++--- .../network/clientpackets/RequestPartyMatchList.java | 6 +++--- .../network/clientpackets/RequestWithDrawalParty.java | 4 ++-- .../network/clientpackets/RequestWithdrawPartyRoom.java | 4 ++-- .../serverpackets/ExListPartyMatchingWaitingRoom.java | 2 +- .../network/serverpackets/ExManagePartyRoomMember.java | 2 +- .../gameserver/network/serverpackets/ExPartyRoomMember.java | 2 +- .../gameserver/network/serverpackets/ListPartyWating.java | 4 ++-- .../gameserver/network/serverpackets/PartyMatchDetail.java | 2 +- .../scripts/handlers/chathandlers/ChatPartyMatchRoom.java | 4 ++-- .../java/org/l2jmobius/gameserver/GameServer.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/Party.java | 1 + .../gameserver/model/actor/instance/PlayerInstance.java | 6 +++--- .../gameserver/model/partymatching}/PartyMatchRoom.java | 2 +- .../gameserver/model/partymatching}/PartyMatchRoomList.java | 2 +- .../model/partymatching}/PartyMatchWaitingList.java | 2 +- .../network/clientpackets/AnswerJoinPartyRoom.java | 6 +++--- .../network/clientpackets/RequestAnswerJoinParty.java | 4 ++-- .../network/clientpackets/RequestDismissPartyRoom.java | 4 ++-- .../clientpackets/RequestExitPartyMatchingWaitingRoom.java | 2 +- .../network/clientpackets/RequestOustFromPartyRoom.java | 6 +++--- .../network/clientpackets/RequestPartyMatchConfig.java | 6 +++--- .../network/clientpackets/RequestPartyMatchDetail.java | 6 +++--- .../network/clientpackets/RequestPartyMatchList.java | 6 +++--- .../network/clientpackets/RequestWithDrawalParty.java | 4 ++-- .../network/clientpackets/RequestWithdrawPartyRoom.java | 4 ++-- .../serverpackets/ExListPartyMatchingWaitingRoom.java | 2 +- .../network/serverpackets/ExManagePartyRoomMember.java | 2 +- .../gameserver/network/serverpackets/ExPartyRoomMember.java | 2 +- .../gameserver/network/serverpackets/ListPartyWating.java | 4 ++-- .../gameserver/network/serverpackets/PartyMatchDetail.java | 2 +- 65 files changed, 124 insertions(+), 120 deletions(-) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{ => partymatching}/PartyMatchRoom.java (98%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{ => partymatching}/PartyMatchRoomList.java (98%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{ => partymatching}/PartyMatchWaitingList.java (96%) rename {L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model => L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/partymatching}/PartyMatchRoom.java (94%) rename {L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model => L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/partymatching}/PartyMatchRoomList.java (94%) rename {L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model => L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/partymatching}/PartyMatchWaitingList.java (93%) rename {L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model => L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/partymatching}/PartyMatchRoom.java (94%) rename {L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model => L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/partymatching}/PartyMatchRoomList.java (94%) rename {L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model => L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/partymatching}/PartyMatchWaitingList.java (93%) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java index 341ef8061c..0d6383f28a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -112,8 +112,6 @@ import org.l2jmobius.gameserver.instancemanager.RaidBossPointsManager; import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.Manor; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.entity.Announcements; import org.l2jmobius.gameserver.model.entity.Hero; @@ -128,6 +126,8 @@ import org.l2jmobius.gameserver.model.entity.siege.clanhalls.BanditStrongholdSie import org.l2jmobius.gameserver.model.entity.siege.clanhalls.DevastatedCastle; import org.l2jmobius.gameserver.model.entity.siege.clanhalls.FortressOfResistance; import org.l2jmobius.gameserver.model.multisell.Multisell; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.spawn.AutoSpawn; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GamePacketHandler; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java index a520881d13..f82e3989d2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java @@ -36,6 +36,8 @@ import org.l2jmobius.gameserver.model.actor.instance.SummonInstance; import org.l2jmobius.gameserver.model.entity.DimensionalRift; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.model.skills.Stats; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 1bafb70cd6..2f04ff4389 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -99,9 +99,6 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroList; import org.l2jmobius.gameserver.model.ManufactureList; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.PetInventory; import org.l2jmobius.gameserver.model.PlayerFreight; import org.l2jmobius.gameserver.model.PlayerInventory; @@ -156,6 +153,9 @@ import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PartyMatchRoom.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoom.java similarity index 98% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PartyMatchRoom.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoom.java index 59f3eef36f..101c246746 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PartyMatchRoom.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoom.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; +package org.l2jmobius.gameserver.model.partymatching; import java.util.ArrayList; import java.util.List; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PartyMatchRoomList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java similarity index 98% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PartyMatchRoomList.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java index 0531413c8e..7dc4d859a5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PartyMatchRoomList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.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; +package org.l2jmobius.gameserver.model.partymatching; import java.util.HashMap; import java.util.Map; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PartyMatchWaitingList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PartyMatchWaitingList.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java index 16d3b71c02..b7e2e7caf4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PartyMatchWaitingList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.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; +package org.l2jmobius.gameserver.model.partymatching; import java.util.ArrayList; import java.util.List; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java index e75ebd2864..344b1a8de2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java @@ -16,11 +16,11 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExManagePartyRoomMember; import org.l2jmobius.gameserver.network.serverpackets.ExPartyRoomMember; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java index b96aba0e04..4f0e246069 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExManagePartyRoomMember; import org.l2jmobius.gameserver.network.serverpackets.JoinParty; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java index d505b57a9b..a023f30751 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; /** * Format: (ch) dd diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java index 65257aa5fd..64d715413f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java @@ -16,8 +16,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; /** * Format: (ch) this is just a trigger : no data diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java index c1d3078e43..4f7ca788bc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java @@ -17,11 +17,11 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.gameserver.instancemanager.TownManager; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExClosePartyRoom; import org.l2jmobius.gameserver.network.serverpackets.PartyMatchList; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java index 034324169f..add2ee479d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java @@ -16,10 +16,10 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExPartyRoomMember; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java index f33f0c1c52..001d78edb2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java @@ -16,10 +16,10 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExManagePartyRoomMember; import org.l2jmobius.gameserver.network.serverpackets.ExPartyRoomMember; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java index 6c8af85140..f600e1447c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java @@ -18,10 +18,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.logging.Logger; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPartyRoomMember; import org.l2jmobius.gameserver.network.serverpackets.PartyMatchDetail; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java index e3e72345f1..f0de6cd72b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.serverpackets.ExClosePartyRoom; import org.l2jmobius.gameserver.network.serverpackets.ExPartyRoomMember; import org.l2jmobius.gameserver.network.serverpackets.PartyMatchDetail; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java index 1f3048aa56..0f54e85b3e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExClosePartyRoom; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 8c94ea601d..afb0b6ddca 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; /** * @author Gnacik diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java index 6cbdb12ec1..c7ba144f1f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.gameserver.instancemanager.TownManager; -import org.l2jmobius.gameserver.model.PartyMatchRoom; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; /** * @author Gnacik Mode : 0 - add 1 - modify 2 - quit diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 2f26f08a8f..bac5db6948 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.gameserver.instancemanager.TownManager; -import org.l2jmobius.gameserver.model.PartyMatchRoom; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; /** * @author Gnacik diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java index 6cdc8cf5ee..595995a441 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import org.l2jmobius.gameserver.model.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; /** * @author Gnacik diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java index 3da61d5ee1..bb95fabaaf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; public class PartyMatchList extends GameServerPacket { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 7b87002977..5949c62037 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -19,10 +19,10 @@ package handlers.chathandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.handler.IChatHandler; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java index fbf24d5a8f..aaa88e726c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java @@ -134,13 +134,13 @@ import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.games.Lottery; import org.l2jmobius.gameserver.model.AutoSpawnHandler; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.entity.TvTManager; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java index 136853c3ae..751399f1d8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.entity.DimensionalRift; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExCloseMPCC; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 464e032576..3713e0f174 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -126,9 +126,6 @@ import org.l2jmobius.gameserver.model.MacroList; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.PremiumItem; @@ -235,6 +232,9 @@ import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.multisell.PreparedListContainer; import org.l2jmobius.gameserver.model.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/PartyMatchRoom.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoom.java similarity index 94% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/PartyMatchRoom.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoom.java index 97a01b0f6f..d0f173cee1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/PartyMatchRoom.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoom.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; +package org.l2jmobius.gameserver.model.partymatching; import java.util.ArrayList; import java.util.List; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/PartyMatchRoomList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java similarity index 94% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/PartyMatchRoomList.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java index 8558c21a03..3af6f9e96d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/PartyMatchRoomList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.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; +package org.l2jmobius.gameserver.model.partymatching; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/PartyMatchWaitingList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java similarity index 93% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/PartyMatchWaitingList.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java index 600bca1143..26f19dcc82 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/PartyMatchWaitingList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.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; +package org.l2jmobius.gameserver.model.partymatching; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java index b9080b5107..2503efdc77 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java @@ -17,11 +17,11 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExManagePartyRoomMember; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java index 06c5a88209..4d6f3e5bad 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java @@ -18,9 +18,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExManagePartyRoomMember; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java index 57f44d57be..8884b40e07 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java index 0660de9d8b..8e9c3b61bd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java index 6d01c4dd42..2378e895cb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java @@ -17,11 +17,11 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExClosePartyRoom; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java index 9440993034..30672b2074 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java index aac3320342..46b0656e99 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExManagePartyRoomMember; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java index 2d912f16b0..5de9b7307a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPartyRoomMember; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java index 0de6deb149..410fcaf191 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExClosePartyRoom; import org.l2jmobius.gameserver.network.serverpackets.ExPartyRoomMember; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java index c4020caf4f..8d918b531d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExClosePartyRoom; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index f7c05fec4f..8c943297d1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java index 3c4fecc32f..2e8dd61ea2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.PartyMatchRoom; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 6a2d946897..c682f1e9ef 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.PartyMatchRoom; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java index 573858375a..9b14b03901 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java index 9a5f99a27f..e3f0fd0a73 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 7b87002977..5949c62037 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -19,10 +19,10 @@ package handlers.chathandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.handler.IChatHandler; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java index b875d6dcb4..a4d8c1f4ff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java @@ -135,13 +135,13 @@ import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.games.Lottery; import org.l2jmobius.gameserver.model.AutoSpawnHandler; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.entity.TvTManager; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java index e5f479b0fc..c77116eddb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.entity.DimensionalRift; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.model.stats.Stats; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index db346655c3..568e032639 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -127,9 +127,6 @@ import org.l2jmobius.gameserver.model.MacroList; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.PremiumItem; @@ -241,6 +238,9 @@ import org.l2jmobius.gameserver.model.multisell.PreparedListContainer; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameTask; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/PartyMatchRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoom.java similarity index 94% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/PartyMatchRoom.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoom.java index 97a01b0f6f..d0f173cee1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/PartyMatchRoom.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoom.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; +package org.l2jmobius.gameserver.model.partymatching; import java.util.ArrayList; import java.util.List; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/PartyMatchRoomList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java similarity index 94% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/PartyMatchRoomList.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java index 8558c21a03..3af6f9e96d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/PartyMatchRoomList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.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; +package org.l2jmobius.gameserver.model.partymatching; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/PartyMatchWaitingList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java similarity index 93% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/PartyMatchWaitingList.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java index 600bca1143..26f19dcc82 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/PartyMatchWaitingList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.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; +package org.l2jmobius.gameserver.model.partymatching; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java index b9080b5107..2503efdc77 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java @@ -17,11 +17,11 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExManagePartyRoomMember; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java index 06c5a88209..4d6f3e5bad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java @@ -18,9 +18,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExManagePartyRoomMember; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java index 57f44d57be..8884b40e07 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java index 0660de9d8b..8e9c3b61bd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java index 6d01c4dd42..2378e895cb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java @@ -17,11 +17,11 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExClosePartyRoom; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java index 9440993034..30672b2074 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java index aac3320342..46b0656e99 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExManagePartyRoomMember; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java index 2d912f16b0..5de9b7307a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPartyRoomMember; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java index 0de6deb149..410fcaf191 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExClosePartyRoom; import org.l2jmobius.gameserver.network.serverpackets.ExPartyRoomMember; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java index c4020caf4f..8d918b531d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExClosePartyRoom; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index f7c05fec4f..8c943297d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.PartyMatchWaitingList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchWaitingList; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java index 3c4fecc32f..2e8dd61ea2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.PartyMatchRoom; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 6a2d946897..c682f1e9ef 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.PartyMatchRoom; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java index 5f30aa9455..f033541e98 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.PartyMatchRoom; -import org.l2jmobius.gameserver.model.PartyMatchRoomList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java index 6dfccdfda3..8d5d364741 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.PartyMatchRoom; +import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; import org.l2jmobius.gameserver.network.OutgoingPackets; /**