lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Partial sync latest Test changes to HighFive.

Browse Source
This commit is contained in:
MobiusDev
2016-10-30 10:59:21 +00:00
parent 6f92e7d596
commit 993528e000
8 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java vendored
View File

@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.SevenSigns;
import com.l2jmobius.gameserver.SevenSignsFestival; import com.l2jmobius.gameserver.SevenSignsFestival;
import com.l2jmobius.gameserver.handler.IBypassHandler; import com.l2jmobius.gameserver.handler.IBypassHandler;
import com.l2jmobius.gameserver.model.L2Party; 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.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.instance.L2FestivalGuideInstance; 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) if (party.getMemberCount() > Config.ALT_FESTIVAL_MIN_PLAYER)
{ {
party.removePartyMember(activeChar, messageType.Expelled); party.removePartyMember(activeChar, MessageType.EXPELLED);
} }
else else
{ {

4
L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java
View File

@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.datatables.SpawnTable;
import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.L2Party; 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.L2Spawn;
import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.Location; 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)) if ((festivalParty != null) && (festivalParty.getMemberCount() < Config.ALT_FESTIVAL_MIN_PLAYER))
{ {
updateParticipants(player, null); // under minimum count updateParticipants(player, null); // under minimum count
festivalParty.removePartyMember(player, messageType.Expelled); festivalParty.removePartyMember(player, MessageType.EXPELLED);
} }
} }
} }

4
L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java
View File

@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.data.xml.impl.TransformData; import com.l2jmobius.gameserver.data.xml.impl.TransformData;
import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.datatables.SkillData;
import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; 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.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -426,7 +426,7 @@ public class CursedWeapon implements INamable
_player.setPkKills(0); _player.setPkKills(0);
if (_player.isInParty()) if (_player.isInParty())
{ {
_player.getParty().removePartyMember(_player, messageType.Expelled); _player.getParty().removePartyMember(_player, MessageType.EXPELLED);
} }
// Disable All Skills // Disable All Skills

28
L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@@ -97,12 +97,12 @@ public class L2Party extends AbstractPlayerGroup
/** /**
* The message type send to the party members. * The message type send to the party members.
*/ */
public enum messageType public enum MessageType
{ {
Expelled, EXPELLED,
Left, LEFT,
None, NONE,
Disconnected DISCONNECTED
} }
/** /**
@@ -377,9 +377,9 @@ public class L2Party extends AbstractPlayerGroup
/** /**
* Removes a party member using its name. * Removes a party member using its name.
* @param name player the player to be removed from the party. * @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); removePartyMember(getPlayerByName(name), type);
} }
@@ -387,16 +387,16 @@ public class L2Party extends AbstractPlayerGroup
/** /**
* Removes a party member instance. * Removes a party member instance.
* @param player the player to be removed from the party. * @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)) if (getMembers().contains(player))
{ {
final boolean isLeader = isLeader(player); final boolean isLeader = isLeader(player);
if (!_disbanding) 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(); disbandParty();
return; return;
@@ -434,14 +434,14 @@ public class L2Party extends AbstractPlayerGroup
} }
SystemMessage msg; SystemMessage msg;
if (type == messageType.Expelled) if (type == MessageType.EXPELLED)
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_EXPELLED_FROM_THE_PARTY); player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_EXPELLED_FROM_THE_PARTY);
msg = SystemMessage.getSystemMessage(SystemMessageId.C1_WAS_EXPELLED_FROM_THE_PARTY); msg = SystemMessage.getSystemMessage(SystemMessageId.C1_WAS_EXPELLED_FROM_THE_PARTY);
msg.addString(player.getName()); msg.addString(player.getName());
broadcastPacket(msg); 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); player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_THE_PARTY);
msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_LEFT_THE_PARTY); msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_LEFT_THE_PARTY);
@@ -468,7 +468,7 @@ public class L2Party extends AbstractPlayerGroup
{ {
player.sendPacket(new ExCloseMPCC()); 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 = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER);
msg.addString(getLeader().getName()); msg.addString(getLeader().getName());
@@ -529,7 +529,7 @@ public class L2Party extends AbstractPlayerGroup
{ {
if (member != null) if (member != null)
{ {
removePartyMember(member, messageType.None); removePartyMember(member, MessageType.NONE);
} }
} }
} }

6
L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -123,7 +123,7 @@ import com.l2jmobius.gameserver.model.L2EnchantSkillLearn;
import com.l2jmobius.gameserver.model.L2ManufactureItem; import com.l2jmobius.gameserver.model.L2ManufactureItem;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.L2Party; 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.L2PetLevelData;
import com.l2jmobius.gameserver.model.L2PremiumItem; import com.l2jmobius.gameserver.model.L2PremiumItem;
import com.l2jmobius.gameserver.model.L2Radar; import com.l2jmobius.gameserver.model.L2Radar;
@@ -6460,7 +6460,7 @@ public final class L2PcInstance extends L2Playable
{ {
if (isInParty()) if (isInParty())
{ {
_party.removePartyMember(this, messageType.Disconnected); _party.removePartyMember(this, MessageType.DISCONNECTED);
_party = null; _party = null;
} }
} }
@@ -9412,7 +9412,7 @@ public final class L2PcInstance extends L2Playable
if (getParty() != null) if (getParty() != null)
{ {
getParty().removePartyMember(this, messageType.Expelled); getParty().removePartyMember(this, MessageType.EXPELLED);
} }
_olympiadGameId = id; _olympiadGameId = id;

4
L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.instancemanager.AntiFeedManager;
import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.instancemanager.CastleManager;
import com.l2jmobius.gameserver.instancemanager.FortManager; import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.model.L2Party; 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.Location;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.actor.L2Summon;
@@ -256,7 +256,7 @@ public abstract class AbstractOlympiadGame
final L2Party party = player.getParty(); final L2Party party = player.getParty();
if (party != null) if (party != null)
{ {
party.removePartyMember(player, messageType.Expelled); party.removePartyMember(player, MessageType.EXPELLED);
} }
} }
// Remove Agathion // Remove Agathion

4
L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java
View File

@@ -16,7 +16,7 @@
*/ */
package com.l2jmobius.gameserver.network.clientpackets; 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; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
/** /**
@@ -52,7 +52,7 @@ public final class RequestOustPartyMember extends L2GameClientPacket
} }
else else
{ {
activeChar.getParty().removePartyMember(_name, messageType.Expelled); activeChar.getParty().removePartyMember(_name, MessageType.EXPELLED);
} }
} }
} }

4
L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java
View File

@@ -17,7 +17,7 @@
package com.l2jmobius.gameserver.network.clientpackets; package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.gameserver.model.L2Party; 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.PartyMatchRoom;
import com.l2jmobius.gameserver.model.PartyMatchRoomList; import com.l2jmobius.gameserver.model.PartyMatchRoomList;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -58,7 +58,7 @@ public final class RequestWithDrawalParty extends L2GameClientPacket
} }
else else
{ {
party.removePartyMember(player, messageType.Left); party.removePartyMember(player, MessageType.LEFT);
if (player.isInPartyMatchRoom()) if (player.isInPartyMatchRoom())
{ {