diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java index 361ea2ec8a..16cf44e49c 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java @@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.SevenSigns; import com.l2jmobius.gameserver.SevenSignsFestival; import com.l2jmobius.gameserver.handler.IBypassHandler; import com.l2jmobius.gameserver.model.L2Party; -import com.l2jmobius.gameserver.model.L2Party.messageType; +import com.l2jmobius.gameserver.model.L2Party.MessageType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2FestivalGuideInstance; @@ -310,7 +310,7 @@ public class Festival implements IBypassHandler { if (party.getMemberCount() > Config.ALT_FESTIVAL_MIN_PLAYER) { - party.removePartyMember(activeChar, messageType.Expelled); + party.removePartyMember(activeChar, MessageType.EXPELLED); } else { diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java index 001798801b..ecfa67c2e5 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java @@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.datatables.SpawnTable; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2Party; -import com.l2jmobius.gameserver.model.L2Party.messageType; +import com.l2jmobius.gameserver.model.L2Party.MessageType; import com.l2jmobius.gameserver.model.L2Spawn; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; @@ -1423,7 +1423,7 @@ public class SevenSignsFestival implements SpawnListener if ((festivalParty != null) && (festivalParty.getMemberCount() < Config.ALT_FESTIVAL_MIN_PLAYER)) { updateParticipants(player, null); // under minimum count - festivalParty.removePartyMember(player, messageType.Expelled); + festivalParty.removePartyMember(player, MessageType.EXPELLED); } } } diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java index a595780c91..f8e7f65d74 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.TransformData; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; -import com.l2jmobius.gameserver.model.L2Party.messageType; +import com.l2jmobius.gameserver.model.L2Party.MessageType; import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -426,7 +426,7 @@ public class CursedWeapon implements INamable _player.setPkKills(0); if (_player.isInParty()) { - _player.getParty().removePartyMember(_player, messageType.Expelled); + _player.getParty().removePartyMember(_player, MessageType.EXPELLED); } // Disable All Skills diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java index 68c8de5b9f..b232763ff6 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java @@ -97,12 +97,12 @@ public class L2Party extends AbstractPlayerGroup /** * The message type send to the party members. */ - public enum messageType + public enum MessageType { - Expelled, - Left, - None, - Disconnected + EXPELLED, + LEFT, + NONE, + DISCONNECTED } /** @@ -377,9 +377,9 @@ public class L2Party extends AbstractPlayerGroup /** * Removes a party member using its name. * @param name player the player to be removed from the party. - * @param type the message type {@link messageType}. + * @param type the message type {@link MessageType}. */ - public void removePartyMember(String name, messageType type) + public void removePartyMember(String name, MessageType type) { removePartyMember(getPlayerByName(name), type); } @@ -387,16 +387,16 @@ public class L2Party extends AbstractPlayerGroup /** * Removes a party member instance. * @param player the player to be removed from the party. - * @param type the message type {@link messageType}. + * @param type the message type {@link MessageType}. */ - public void removePartyMember(L2PcInstance player, messageType type) + public void removePartyMember(L2PcInstance player, MessageType type) { if (getMembers().contains(player)) { final boolean isLeader = isLeader(player); if (!_disbanding) { - if ((getMembers().size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != messageType.Disconnected))) + if ((getMembers().size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) { disbandParty(); return; @@ -434,14 +434,14 @@ public class L2Party extends AbstractPlayerGroup } SystemMessage msg; - if (type == messageType.Expelled) + if (type == MessageType.EXPELLED) { player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_EXPELLED_FROM_THE_PARTY); msg = SystemMessage.getSystemMessage(SystemMessageId.C1_WAS_EXPELLED_FROM_THE_PARTY); msg.addString(player.getName()); broadcastPacket(msg); } - else if ((type == messageType.Left) || (type == messageType.Disconnected)) + else if ((type == MessageType.LEFT) || (type == MessageType.DISCONNECTED)) { player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_PARTY); msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_LEFT_THE_PARTY); @@ -468,7 +468,7 @@ public class L2Party extends AbstractPlayerGroup { player.sendPacket(new ExCloseMPCC()); } - if (isLeader && (getMembers().size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == messageType.Disconnected))) + if (isLeader && (getMembers().size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) { msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); @@ -529,7 +529,7 @@ public class L2Party extends AbstractPlayerGroup { if (member != null) { - removePartyMember(member, messageType.None); + removePartyMember(member, MessageType.NONE); } } } diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 1de7502fa5..87fec316e5 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -123,7 +123,7 @@ import com.l2jmobius.gameserver.model.L2EnchantSkillLearn; import com.l2jmobius.gameserver.model.L2ManufactureItem; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Party; -import com.l2jmobius.gameserver.model.L2Party.messageType; +import com.l2jmobius.gameserver.model.L2Party.MessageType; import com.l2jmobius.gameserver.model.L2PetLevelData; import com.l2jmobius.gameserver.model.L2PremiumItem; import com.l2jmobius.gameserver.model.L2Radar; @@ -6460,7 +6460,7 @@ public final class L2PcInstance extends L2Playable { if (isInParty()) { - _party.removePartyMember(this, messageType.Disconnected); + _party.removePartyMember(this, MessageType.DISCONNECTED); _party = null; } } @@ -9412,7 +9412,7 @@ public final class L2PcInstance extends L2Playable if (getParty() != null) { - getParty().removePartyMember(this, messageType.Expelled); + getParty().removePartyMember(this, MessageType.EXPELLED); } _olympiadGameId = id; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 59f8af885c..0d661d4987 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.instancemanager.AntiFeedManager; import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.instancemanager.FortManager; import com.l2jmobius.gameserver.model.L2Party; -import com.l2jmobius.gameserver.model.L2Party.messageType; +import com.l2jmobius.gameserver.model.L2Party.MessageType; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; @@ -256,7 +256,7 @@ public abstract class AbstractOlympiadGame final L2Party party = player.getParty(); if (party != null) { - party.removePartyMember(player, messageType.Expelled); + party.removePartyMember(player, MessageType.EXPELLED); } } // Remove Agathion diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java index 0767def4f5..832da88e89 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.gameserver.model.L2Party.messageType; +import com.l2jmobius.gameserver.model.L2Party.MessageType; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; /** @@ -52,7 +52,7 @@ public final class RequestOustPartyMember extends L2GameClientPacket } else { - activeChar.getParty().removePartyMember(_name, messageType.Expelled); + activeChar.getParty().removePartyMember(_name, MessageType.EXPELLED); } } } diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java index 9fe162fe90..abf34ff30c 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java @@ -17,7 +17,7 @@ package com.l2jmobius.gameserver.network.clientpackets; import com.l2jmobius.gameserver.model.L2Party; -import com.l2jmobius.gameserver.model.L2Party.messageType; +import com.l2jmobius.gameserver.model.L2Party.MessageType; import com.l2jmobius.gameserver.model.PartyMatchRoom; import com.l2jmobius.gameserver.model.PartyMatchRoomList; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -58,7 +58,7 @@ public final class RequestWithDrawalParty extends L2GameClientPacket } else { - party.removePartyMember(player, messageType.Left); + party.removePartyMember(player, MessageType.LEFT); if (player.isInPartyMatchRoom()) {