BETA: Removing backward compatibility for L2Party/L2CommandChannel if you want it skip that changeset thanks Battlecruiser

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSignsFestival.java

@@ -1389,7 +1389,7 @@ public class SevenSignsFestival implements SpawnListener
 		if (festivalParty != null)
 		{
 			participants = new ArrayList<Integer>(festivalParty.getMemberCount());
-			for (L2PcInstance player : festivalParty.getPartyMembers())
+			for (L2PcInstance player : festivalParty.getMembers())
 			{
 				if (player == null)
 					continue;
@@ -1397,7 +1397,7 @@ public class SevenSignsFestival implements SpawnListener
 			}
 			
 			if (Config.DEBUG)
-				_log.info("SevenSignsFestival: " + festivalParty.getPartyMembers().toString() + " have signed up to the "
+				_log.info("SevenSignsFestival: " + festivalParty.getMembers().size() + " have signed up to the "
 						+ SevenSigns.getCabalShortName(oracle) + " " + getFestivalName(festivalId) + " festival.");
 		}
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ItemTable.java

@@ -290,7 +290,7 @@ public class ItemTable
 				// if in CommandChannel and was killing a World/RaidBoss
 				if (raid.getFirstCommandChannelAttacked() != null && !Config.AUTO_LOOT_RAIDS)
 				{
-					item.setOwnerId(raid.getFirstCommandChannelAttacked().getChannelLeader().getObjectId());
+					item.setOwnerId(raid.getFirstCommandChannelAttacked().getLeaderObjectId());
 					itemLootShedule = ThreadPoolManager.getInstance().scheduleGeneral(new ResetOwner(item), Config.LOOT_RAIDS_PRIVILEGE_INTERVAL);
 					item.setItemLootShedule(itemLootShedule);
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java

@@ -275,7 +275,7 @@ public class DimensionalRiftManager
 			return;
 		}
 		
-		if (player.getParty().getPartyLeaderOID() != player.getObjectId())
+		if (player.getParty().getLeaderObjectId() != player.getObjectId())
 		{
 			showHtmlFile(player, "data/html/seven_signs/rift/NotPartyLeader.htm", npc);
 			return;
@@ -304,7 +304,7 @@ public class DimensionalRiftManager
 			return;
 		}
 		
-		for (L2PcInstance p : player.getParty().getPartyMembers())
+		for (L2PcInstance p : player.getParty().getMembers())
 			if (!checkIfInPeaceZone(p.getX(), p.getY(), p.getZ()))
 			{
 				canPass = false;
@@ -319,7 +319,7 @@ public class DimensionalRiftManager
 		
 		L2ItemInstance i;
 		int count = getNeededItems(type);
-		for (L2PcInstance p : player.getParty().getPartyMembers())
+		for (L2PcInstance p : player.getParty().getMembers())
 		{
 			i = p.getInventory().getItemByItemId(DIMENSIONAL_FRAGMENT_ITEM_ID);
 			
@@ -354,7 +354,7 @@ public class DimensionalRiftManager
 			return;
 		}
 		
-		for (L2PcInstance p : player.getParty().getPartyMembers())
+		for (L2PcInstance p : player.getParty().getMembers())
 		{
 			i = p.getInventory().getItemByItemId(DIMENSIONAL_FRAGMENT_ITEM_ID);
 			if (!p.destroyItem("RiftEntrance", i, count, null, false))

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DuelManager.java

@@ -69,7 +69,7 @@ public class DuelManager
 		if (partyDuel == 1)
 		{
 			boolean playerInPvP = false;
-			for (L2PcInstance temp : playerA.getParty().getPartyMembers())
+			for (L2PcInstance temp : playerA.getParty().getMembers())
 			{
 				if (temp.getPvpFlag() != 0)
 				{
@@ -79,7 +79,7 @@ public class DuelManager
 			}
 			if (!playerInPvP)
 			{
-				for (L2PcInstance temp : playerB.getParty().getPartyMembers())
+				for (L2PcInstance temp : playerB.getParty().getMembers())
 				{
 					if (temp.getPvpFlag() != 0)
 					{
@@ -91,11 +91,11 @@ public class DuelManager
 			// A player has PvP flag
 			if (playerInPvP)
 			{
-				for (L2PcInstance temp : playerA.getParty().getPartyMembers())
+				for (L2PcInstance temp : playerA.getParty().getMembers())
 				{
 					temp.sendMessage(engagedInPvP);
 				}
-				for (L2PcInstance temp : playerB.getParty().getPartyMembers())
+				for (L2PcInstance temp : playerB.getParty().getMembers())
 				{
 					temp.sendMessage(engagedInPvP);
 				}
@@ -194,11 +194,11 @@ public class DuelManager
 		}
 		else if (duel.isPartyDuel())
 		{
-			if (duel.getPlayerA().getParty() != null && duel.getPlayerA().getParty().getPartyMembers().contains(player))
+			if (duel.getPlayerA().getParty() != null && duel.getPlayerA().getParty().getMembers().contains(player))
 			{
 				duel.broadcastToTeam2(packet);
 			}
-			else if (duel.getPlayerB().getParty() != null && duel.getPlayerB().getParty().getPartyMembers().contains(player))
+			else if (duel.getPlayerB().getParty() != null && duel.getPlayerB().getParty().getMembers().contains(player))
 			{
 				duel.broadcastToTeam1(packet);
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java

@@ -922,7 +922,7 @@ public class FourSepulchersManager
 				return;
 			}
 			
-			for (L2PcInstance mem : player.getParty().getPartyMembers())
+			for (L2PcInstance mem : player.getParty().getMembers())
 			{
 				QuestState qs = mem.getQuestState(QUEST_ID);
 				if (qs == null || (!qs.isStarted() && !qs.isCompleted()))
@@ -950,7 +950,7 @@ public class FourSepulchersManager
 				showHtmlFile(player, npcId + "-NL.htm", npc, null);
 				return;
 			}
-			for (L2PcInstance mem : player.getParty().getPartyMembers())
+			for (L2PcInstance mem : player.getParty().getMembers())
 			{
 				QuestState qs = mem.getQuestState(QUEST_ID);
 				if (qs == null || (!qs.isStarted() && !qs.isCompleted()))
@@ -1012,7 +1012,7 @@ public class FourSepulchersManager
 		if (Config.FS_PARTY_MEMBER_COUNT > 1)
 		{
 			List<L2PcInstance> members = new FastList<L2PcInstance>();
-			for (L2PcInstance mem : player.getParty().getPartyMembers())
+			for (L2PcInstance mem : player.getParty().getMembers())
 			{
 				if (!mem.isDead() && Util.checkIfInRange(700, player, mem, true))
 				{
@@ -1048,7 +1048,7 @@ public class FourSepulchersManager
 		if (Config.FS_PARTY_MEMBER_COUNT <= 1 && player.isInParty())
 		{
 			List<L2PcInstance> members = new FastList<L2PcInstance>();
-			for (L2PcInstance mem : player.getParty().getPartyMembers())
+			for (L2PcInstance mem : player.getParty().getMembers())
 			{
 				if (!mem.isDead() && Util.checkIfInRange(700, player, mem, true))
 				{

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java

@@ -531,7 +531,7 @@ public class TerritoryWarManager implements Siegable
 		if (victimSide == 0)
 			return;
 		if (killer.getParty() != null && type < 5)
-			for(L2PcInstance pl : killer.getParty().getPartyMembers())
+			for(L2PcInstance pl : killer.getParty().getMembers())
 			{
 				if (pl.getSiegeSide() == victimSide || pl.getSiegeSide() == 0 || !Util.checkIfInRange(2000, killer, pl, false))
 					continue;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/CharEffectList.java

@@ -1143,13 +1143,13 @@ public class CharEffectList
 				if (summonOwner != null)
 				{
 					if (summonOwner.isInParty())
-						summonOwner.getParty().broadcastToPartyMembers(ps);
+						summonOwner.getParty().broadcastPacket(ps);
 					else
 						summonOwner.sendPacket(ps);
 				}
 			}
 			else if (_owner instanceof L2PcInstance && _owner.isInParty())
-				_owner.getParty().broadcastToPartyMembers(ps);
+				_owner.getParty().broadcastPacket(ps);
 		}
 		
 		if (os != null)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Attackable.java

@@ -466,7 +466,7 @@ public class L2Attackable extends L2Npc
 							_commandChannelTimer = new CommandChannelTimer(this);
 							_commandChannelLastAttack = System.currentTimeMillis();
 							ThreadPoolManager.getInstance().scheduleGeneral(_commandChannelTimer, 10000); // check for last attack
-							_firstCommandChannelAttacked.broadcastToChannelMembers(new CreatureSay(0, Say2.PARTYROOM_ALL, "", "You have looting rights!")); //TODO: retail msg
+							_firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, Say2.PARTYROOM_ALL, "", "You have looting rights!")); //TODO: retail msg
 						}
 					}
 				}
@@ -775,7 +775,7 @@ public class L2Attackable extends L2Npc
 						if (attackerParty.isInCommandChannel())
 							groupMembers = attackerParty.getCommandChannel().getMembers();
 						else
-							groupMembers = attackerParty.getPartyMembers();
+							groupMembers = attackerParty.getMembers();
 						
 						for (L2PcInstance pl : groupMembers)
 						{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2BirthdayCakeInstance.java

@@ -91,7 +91,7 @@ public class L2BirthdayCakeInstance extends L2Npc
 					}
 					else
 					{
-						for (L2PcInstance member : party.getPartyMembers())
+						for (L2PcInstance member : party.getMembers())
 						{
 							if ((member != null) && member.isInsideRadius(_cake, _skill.getSkillRadius(), true, true))
 							{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CubicInstance.java

@@ -328,7 +328,7 @@ public class L2CubicInstance
 					
 					if (partyA != null)
 					{
-						if (partyA.getPartyMembers().contains(_owner))
+						if (partyA.getMembers().contains(_owner))
 							if (partyB != null)
 								partyEnemy = partyB;
 							else
@@ -351,7 +351,7 @@ public class L2CubicInstance
 							return;
 					if (partyEnemy != null)
 					{
-						if (partyEnemy.getPartyMembers().contains(ownerTarget))
+						if (partyEnemy.getMembers().contains(ownerTarget))
 							_target = (L2Character) ownerTarget;
 						return;
 					}
@@ -422,7 +422,7 @@ public class L2CubicInstance
 						
 						if (_owner.getParty() != null)
 						{
-							if (_owner.getParty().getPartyMembers().contains(enemy))
+							if (_owner.getParty().getMembers().contains(enemy))
 								targetIt = false;
 							else if (_owner.getParty().getCommandChannel() != null)
 							{
@@ -900,7 +900,7 @@ public class L2CubicInstance
 		{
 			// Get all visible objects in a spheric area near the L2Character
 			// Get a list of Party Members
-			List<L2PcInstance> partyList = party.getPartyMembers();
+			List<L2PcInstance> partyList = party.getMembers();
 			for (L2Character partyMember : partyList)
 			{
 				if (!partyMember.isDead())

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2GrandBossInstance.java

@@ -77,7 +77,7 @@ public final class L2GrandBossInstance extends L2MonsterInstance
 			broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.RAID_WAS_SUCCESSFUL));
 			if (player.getParty() != null)
 			{
-				for (L2PcInstance member : player.getParty().getPartyMembers())
+				for (L2PcInstance member : player.getParty().getMembers())
 				{
 					RaidBossPointsManager.getInstance().addPoints(member, getNpcId(), (getLevel() / 2) + Rnd.get(-5, 5));
 					if(member.isNoble())

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -1157,9 +1157,9 @@ public final class L2PcInstance extends L2Playable
 		if (getParty() != null && getParty() == target.getParty())
 		{
 			result |= RelationChanged.RELATION_HAS_PARTY;
-			for (int i = 0; i < getParty().getPartyMembers().size(); i++)
+			for (int i = 0; i < getParty().getMembers().size(); i++)
 			{
-				if (getParty().getPartyMembers().get(i) != this)
+				if (getParty().getMembers().get(i) != this)
 					continue;
 				switch (i)
 				{
@@ -2675,7 +2675,7 @@ public final class L2PcInstance extends L2Playable
 			
 			// Update class icon in party and clan
 			if (isInParty())
-				getParty().broadcastToPartyMembers(new PartySmallWindowUpdate(this));
+				getParty().broadcastPacket(new PartySmallWindowUpdate(this));
 			
 			if (getClan() != null)
 				getClan().broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this));
@@ -5222,7 +5222,7 @@ public final class L2PcInstance extends L2Playable
 		
 		if(newTarget!=null)
 		{
-			boolean isParty=(( (newTarget instanceof L2PcInstance) && isInParty() && getParty().getPartyMembers().contains(newTarget)));
+			boolean isParty=(( (newTarget instanceof L2PcInstance) && isInParty() && getParty().getMembers().contains(newTarget)));
 			
 			// Check if the new target is visible
 			if (!isParty && !newTarget.isVisible())
@@ -8856,7 +8856,7 @@ public final class L2PcInstance extends L2Playable
 			return true;
 		
 		// Check if the attacker is not in the same party. NOTE: Party checks goes before oly checks in order to prevent patry member autoattack at oly. 
-		if (getParty() != null && getParty().getPartyMembers().contains(attacker))
+		if (getParty() != null && getParty().getMembers().contains(attacker))
 			return false;
 		
 		// Check if the attacker is in olympia and olympia start
@@ -9644,7 +9644,7 @@ public final class L2PcInstance extends L2Playable
 			return getParty().getCommandChannel().getMembers().contains(looter);
 		
 		if (isInParty() && looter != null)
-			return getParty().getPartyMembers().contains(looter);
+			return getParty().getMembers().contains(looter);
 		
 		return false;
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RaidBossInstance.java

@@ -89,7 +89,7 @@ public class L2RaidBossInstance extends L2MonsterInstance
 			broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.RAID_WAS_SUCCESSFUL));
 			if (player.getParty() != null)
 			{
-				for (L2PcInstance member : player.getParty().getPartyMembers())
+				for (L2PcInstance member : player.getParty().getMembers())
 				{
 					RaidBossPointsManager.getInstance().addPoints(member, this.getNpcId(), (this.getLevel() / 2) + Rnd.get(-5, 5));
 					if(member.isNoble())

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java

@@ -294,7 +294,7 @@ public class L2SepulcherMonsterInstance extends L2MonsterInstance
 		
 		if (player.getParty() != null)
 		{
-			for (L2PcInstance mem : player.getParty().getPartyMembers())
+			for (L2PcInstance mem : player.getParty().getMembers())
 			{
 				QuestState qs = mem.getQuestState(questId);
 				if (qs != null

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java

@@ -342,7 +342,7 @@ public class L2SepulcherNpcInstance extends L2Npc
 						openNextDoor(getNpcId());
 						if (player.getParty() != null)
 						{
-							for (L2PcInstance mem : player.getParty().getPartyMembers())
+							for (L2PcInstance mem : player.getParty().getMembers())
 							{
 								if (mem != null && mem.getInventory().getItemByItemId(HALLS_KEY) != null)
 									mem.destroyItemByItemId("Quest", HALLS_KEY, mem.getInventory().getItemByItemId(HALLS_KEY).getCount(), mem, true);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TrapInstance.java

@@ -188,7 +188,7 @@ public class L2TrapInstance extends L2Trap
 		
 		if (_owner.isInParty()
 				&& cha.isInParty()
-				&& _owner.getParty().getPartyLeaderOID() == cha.getParty().getPartyLeaderOID())
+				&& _owner.getParty().getLeaderObjectId() == cha.getParty().getLeaderObjectId())
 			return true;
 		
 		return false;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/status/PcStatus.java

@@ -162,7 +162,7 @@ public class PcStatus extends PlayableStatus
 					&& Util.checkIfInRange(1000, getActiveChar(), caster, true)
 					&& !caster.isDead() 
 					&& getActiveChar() != caster
-					&& getActiveChar().getParty().getPartyMembers().contains(caster))
+					&& getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
 				
@@ -171,7 +171,7 @@ public class PcStatus extends PlayableStatus
 				if (transferDmg > 0 && attacker instanceof L2Playable)
 				{
 					int membersInRange = 0;
-					for (L2PcInstance member : caster.getParty().getPartyMembers())
+					for (L2PcInstance member : caster.getParty().getMembers())
 					{
 						if (Util.checkIfInRange(1000, member, caster, false) && member != caster)
 							membersInRange++;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/status/SummonStatus.java

@@ -53,7 +53,7 @@ public class SummonStatus extends PlayableStatus
 					&& Util.checkIfInRange(1000, getActiveChar(), caster, true)
 					&& !caster.isDead() 
 					&& getActiveChar().getOwner() != caster
-					&& getActiveChar().getParty().getPartyMembers().contains(caster))
+					&& getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
 
@@ -62,7 +62,7 @@ public class SummonStatus extends PlayableStatus
 				if (transferDmg > 0 && attacker instanceof L2Playable)
 				{
 					int membersInRange = 0;
-					for (L2PcInstance member : caster.getParty().getPartyMembers())
+					for (L2PcInstance member : caster.getParty().getMembers())
 					{
 						if (Util.checkIfInRange(1000, member, caster, false) && member != caster)
 							membersInRange++;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/DimensionalRift.java

@@ -67,7 +67,7 @@ public class DimensionalRift
 		_choosenRoom = room;
 		int[] coords = getRoomCoord(room);
 		party.setDimensionalRift(this);
-		for (L2PcInstance p : party.getPartyMembers())
+		for (L2PcInstance p : party.getMembers())
 		{
 			Quest riftQuest = QuestManager.getInstance().getQuest(635);
 			if (riftQuest != null)
@@ -129,7 +129,7 @@ public class DimensionalRift
 					_completedRooms.add(_choosenRoom);
 					_choosenRoom = -1;
 					
-					for (L2PcInstance p : _party.getPartyMembers())
+					for (L2PcInstance p : _party.getMembers())
 						if (!revivedInWaitingRoom.contains(p))
 							teleportToNextRoom(p);
 					createTeleporterTimer(true);
@@ -137,7 +137,7 @@ public class DimensionalRift
 				}
 				else
 				{
-					for (L2PcInstance p : _party.getPartyMembers())
+					for (L2PcInstance p : _party.getMembers())
 						if (!revivedInWaitingRoom.contains(p))
 							teleportToWaitingRoom(p);
 					killRift();
@@ -155,7 +155,7 @@ public class DimensionalRift
 				@Override
 				public void run()
 				{
-					for (L2PcInstance p : _party.getPartyMembers())
+					for (L2PcInstance p : _party.getMembers())
 						if (!revivedInWaitingRoom.contains(p))
 							p.sendPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 65, 9));
 				}
@@ -207,7 +207,7 @@ public class DimensionalRift
 		
 		if (_party.getMemberCount() < Config.RIFT_MIN_PARTY_SIZE || _party.getMemberCount() == 1)
 		{
-			for (L2PcInstance p : _party.getPartyMembers())
+			for (L2PcInstance p : _party.getMembers())
 				teleportToWaitingRoom(p);
 			killRift();
 		}
@@ -218,7 +218,7 @@ public class DimensionalRift
 		if (!player.isInParty() || !player.getParty().isInDimensionalRift())
 			return;
 		
-		if (player.getObjectId() != player.getParty().getPartyLeaderOID())
+		if (player.getObjectId() != player.getParty().getLeaderObjectId())
 		{
 			DimensionalRiftManager.getInstance().showHtmlFile(player, "data/html/seven_signs/rift/NotPartyLeader.htm", npc);
 			return;
@@ -235,7 +235,7 @@ public class DimensionalRift
 		_completedRooms.add(_choosenRoom);
 		_choosenRoom = -1;
 		
-		for (L2PcInstance p : _party.getPartyMembers())
+		for (L2PcInstance p : _party.getMembers())
 			teleportToNextRoom(p);
 		
 		DimensionalRiftManager.getInstance().getRoom(_type, _choosenRoom).setPartyInside(true);
@@ -249,13 +249,13 @@ public class DimensionalRift
 		if (!player.isInParty() || !player.getParty().isInDimensionalRift())
 			return;
 		
-		if (player.getObjectId() != player.getParty().getPartyLeaderOID())
+		if (player.getObjectId() != player.getParty().getLeaderObjectId())
 		{
 			DimensionalRiftManager.getInstance().showHtmlFile(player, "data/html/seven_signs/rift/NotPartyLeader.htm", npc);
 			return;
 		}
 		
-		for (L2PcInstance p : player.getParty().getPartyMembers())
+		for (L2PcInstance p : player.getParty().getMembers())
 			teleportToWaitingRoom(p);
 		killRift();
 	}
@@ -393,7 +393,7 @@ public class DimensionalRift
 			//int rev = revivedInWaitingRoom.size();
 			//int min = Config.RIFT_MIN_PARTY_SIZE;
 			
-			for (L2PcInstance p : _party.getPartyMembers())
+			for (L2PcInstance p : _party.getMembers())
 				if (p != null && !revivedInWaitingRoom.contains(p))
 					teleportToWaitingRoom(p);
 			killRift();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Duel.java

@@ -281,14 +281,14 @@ public class Duel
 		ActionFailed af = ActionFailed.STATIC_PACKET;
 		if (_partyDuel)
 		{
-			for (L2PcInstance temp : _playerA.getParty().getPartyMembers())
+			for (L2PcInstance temp : _playerA.getParty().getMembers())
 			{
 				temp.abortCast();
 				temp.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
 				temp.setTarget(null);
 				temp.sendPacket(af);
 			}
-			for (L2PcInstance temp : _playerB.getParty().getPartyMembers())
+			for (L2PcInstance temp : _playerB.getParty().getMembers())
 			{
 				temp.abortCast();
 				temp.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
@@ -356,7 +356,7 @@ public class Duel
 		{
 			// set isInDuel() state
 			// cancel all active trades, just in case? xD
-			for (L2PcInstance temp : _playerA.getParty().getPartyMembers())
+			for (L2PcInstance temp : _playerA.getParty().getMembers())
 			{
 				temp.cancelActiveTrade();
 				temp.setIsInDuel(_duelId);
@@ -364,7 +364,7 @@ public class Duel
 				temp.broadcastUserInfo();
 				broadcastToTeam2(new ExDuelUpdateUserInfo(temp));
 			}
-			for (L2PcInstance temp : _playerB.getParty().getPartyMembers())
+			for (L2PcInstance temp : _playerB.getParty().getMembers())
 			{
 				temp.cancelActiveTrade();
 				temp.setIsInDuel(_duelId);
@@ -423,11 +423,11 @@ public class Duel
 	{
 		if (_partyDuel)
 		{
-			for (L2PcInstance temp : _playerA.getParty().getPartyMembers())
+			for (L2PcInstance temp : _playerA.getParty().getMembers())
 			{
 				_playerConditions.add(new PlayerCondition(temp, _partyDuel));
 			}
-			for (L2PcInstance temp : _playerB.getParty().getPartyMembers())
+			for (L2PcInstance temp : _playerB.getParty().getMembers())
 			{
 				_playerConditions.add(new PlayerCondition(temp, _partyDuel));
 			}
@@ -448,13 +448,13 @@ public class Duel
 		// update isInDuel() state for all players
 		if (_partyDuel)
 		{
-			for (L2PcInstance temp : _playerA.getParty().getPartyMembers())
+			for (L2PcInstance temp : _playerA.getParty().getMembers())
 			{
 				temp.setIsInDuel(0);
 				temp.setTeam(0);
 				temp.broadcastUserInfo();
 			}
-			for (L2PcInstance temp : _playerB.getParty().getPartyMembers())
+			for (L2PcInstance temp : _playerB.getParty().getMembers())
 			{
 				temp.setIsInDuel(0);
 				temp.setTeam(0);
@@ -550,13 +550,13 @@ public class Duel
 			return;
 		int offset = 0;
 		
-		for (L2PcInstance temp : _playerA.getParty().getPartyMembers())
+		for (L2PcInstance temp : _playerA.getParty().getMembers())
 		{
 			temp.teleToLocation(x + offset - 180, y - 150, z);
 			offset += 40;
 		}
 		offset = 0;
-		for (L2PcInstance temp : _playerB.getParty().getPartyMembers())
+		for (L2PcInstance temp : _playerB.getParty().getMembers())
 		{
 			temp.teleToLocation(x + offset - 180, y + 150, z);
 			offset += 40;
@@ -574,7 +574,7 @@ public class Duel
 		
 		if (_partyDuel && _playerA.getParty() != null)
 		{
-			for (L2PcInstance temp : _playerA.getParty().getPartyMembers())
+			for (L2PcInstance temp : _playerA.getParty().getMembers())
 				temp.sendPacket(packet);
 		}
 		else
@@ -592,7 +592,7 @@ public class Duel
 		
 		if (_partyDuel && _playerB.getParty() != null)
 		{
-			for (L2PcInstance temp : _playerB.getParty().getPartyMembers())
+			for (L2PcInstance temp : _playerB.getParty().getMembers())
 				temp.sendPacket(packet);
 		}
 		else
@@ -642,7 +642,7 @@ public class Duel
 		
 		if (_partyDuel && looser.getParty() != null)
 		{
-			for (L2PcInstance temp : looser.getParty().getPartyMembers())
+			for (L2PcInstance temp : looser.getParty().getMembers())
 				temp.broadcastPacket(new SocialAction(temp.getObjectId(), 7));
 		}
 		else
@@ -836,26 +836,26 @@ public class Duel
 		// TODO: Can every party member cancel a party duel? or only the party leaders?
 		if (_partyDuel)
 		{
-			if (_playerA.getParty().getPartyMembers().contains(player))
+			if (_playerA.getParty().getMembers().contains(player))
 			{
 				_surrenderRequest = 1;
-				for (L2PcInstance temp : _playerA.getParty().getPartyMembers())
+				for (L2PcInstance temp : _playerA.getParty().getMembers())
 				{
 					temp.setDuelState(DUELSTATE_DEAD);
 				}
-				for (L2PcInstance temp : _playerB.getParty().getPartyMembers())
+				for (L2PcInstance temp : _playerB.getParty().getMembers())
 				{
 					temp.setDuelState(DUELSTATE_WINNER);
 				}
 			}
-			else if (_playerB.getParty().getPartyMembers().contains(player))
+			else if (_playerB.getParty().getMembers().contains(player))
 			{
 				_surrenderRequest = 2;
-				for (L2PcInstance temp : _playerB.getParty().getPartyMembers())
+				for (L2PcInstance temp : _playerB.getParty().getMembers())
 				{
 					temp.setDuelState(DUELSTATE_DEAD);
 				}
-				for (L2PcInstance temp : _playerA.getParty().getPartyMembers())
+				for (L2PcInstance temp : _playerA.getParty().getMembers())
 				{
 					temp.setDuelState(DUELSTATE_WINNER);
 				}
@@ -891,7 +891,7 @@ public class Duel
 		if (_partyDuel)
 		{
 			boolean teamdefeated = true;
-			for (L2PcInstance temp : player.getParty().getPartyMembers())
+			for (L2PcInstance temp : player.getParty().getMembers())
 			{
 				if (temp.getDuelState() == DUELSTATE_DUELLING)
 				{
@@ -903,10 +903,10 @@ public class Duel
 			if (teamdefeated)
 			{
 				L2PcInstance winner = _playerA;
-				if (_playerA.getParty().getPartyMembers().contains(player))
+				if (_playerA.getParty().getMembers().contains(player))
 					winner = _playerB;
 				
-				for (L2PcInstance temp : winner.getParty().getPartyMembers())
+				for (L2PcInstance temp : winner.getParty().getMembers())
 				{
 					temp.setDuelState(DUELSTATE_WINNER);
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java

@@ -282,14 +282,14 @@ public class OlympiadManager
 
 				int teamPoints = 0;
 				ArrayList<Integer> team = new ArrayList<Integer>(party.getMemberCount());
-				for (L2PcInstance noble : party.getPartyMembers())
+				for (L2PcInstance noble : party.getMembers())
 				{
 					if (!checkNoble(noble, player))
 					{
 						// remove previously registered party members
 						if (Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0)
 						{
-							for (L2PcInstance unreg : party.getPartyMembers())
+							for (L2PcInstance unreg : party.getMembers())
 							{
 								if (unreg == noble)
 									break;
@@ -315,13 +315,13 @@ public class OlympiadManager
 					// remove previously registered party members
 					if (Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0)
 					{
-						for (L2PcInstance unreg : party.getPartyMembers())
+						for (L2PcInstance unreg : party.getMembers())
 							AntiFeedManager.getInstance().removePlayer(AntiFeedManager.OLYMPIAD_ID, unreg);		
 					}						
 					return false;
 				}
 
-				party.broadcastToPartyMembers(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_REGISTERED_IN_A_WAITING_LIST_OF_TEAM_GAMES));
+				party.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_REGISTERED_IN_A_WAITING_LIST_OF_TEAM_GAMES));
 				_teamsBasedRegisters.add(team);
 				break;
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/Quest.java

@@ -2160,11 +2160,11 @@ public class Quest extends ManagedScript
 			return null;
 		}
 		final L2Party party = player.getParty();
-		if ((party == null) || (party.getPartyMembers().isEmpty()))
+		if ((party == null) || (party.getMembers().isEmpty()))
 		{
 			return player;
 		}
-		return party.getPartyMembers().get(Rnd.get(party.getPartyMembers().size()));
+		return party.getMembers().get(Rnd.get(party.getMembers().size()));
 	}
 	
 	/**
@@ -2208,7 +2208,7 @@ public class Quest extends ManagedScript
 		QuestState temp = null;
 		L2Party party = player.getParty();
 		// if this player is not in a party, just check if this player instance matches the conditions itself
-		if ((party == null) || (party.getPartyMembers().isEmpty()))
+		if ((party == null) || (party.getMembers().isEmpty()))
 		{
 			temp = player.getQuestState(getName());
 			if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value))
@@ -2230,7 +2230,7 @@ public class Quest extends ManagedScript
 			target = player;
 		}
 		
-		for (L2PcInstance partyMember : party.getPartyMembers())
+		for (L2PcInstance partyMember : party.getMembers())
 		{
 			if (partyMember == null)
 			{
@@ -2272,7 +2272,7 @@ public class Quest extends ManagedScript
 		QuestState temp = null;
 		L2Party party = player.getParty();
 		// if this player is not in a party, just check if this player instance matches the conditions itself
-		if ((party == null) || (party.getPartyMembers().isEmpty()))
+		if ((party == null) || (party.getMembers().isEmpty()))
 		{
 			temp = player.getQuestState(getName());
 			if ((temp != null) && (temp.getState() == state))
@@ -2294,7 +2294,7 @@ public class Quest extends ManagedScript
 			target = player;
 		}
 		
-		for (L2PcInstance partyMember : party.getPartyMembers())
+		for (L2PcInstance partyMember : party.getMembers())
 		{
 			if (partyMember == null)
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java

@@ -1470,7 +1470,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 				if (player.isInParty() && targetPlayer.isInParty())
 				{
 					// Same party
-					if (player.getParty().getPartyLeaderOID() == targetPlayer.getParty().getPartyLeaderOID())
+					if (player.getParty().getLeaderObjectId() == targetPlayer.getParty().getLeaderObjectId())
 						return false;
 					
 					// Same commandchannel

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Logout.java

@@ -96,7 +96,7 @@ public final class Logout extends L2GameClientPacket
 			final L2Party playerParty = player.getParty();
 			
 			if (playerParty != null)
-				player.getParty().broadcastToPartyMembers(SystemMessage.sendString(player.getName() + " has been removed from the upcoming Festival."));
+				player.getParty().broadcastPacket(SystemMessage.sendString(player.getName() + " has been removed from the upcoming Festival."));
 		}
 		
 		// Remove player from Boss Zone

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelStart.java

@@ -94,14 +94,14 @@ public final class RequestDuelStart extends L2GameClientPacket
 				return;
 			}
 			// Target may not be of the same party
-			else if (activeChar.getParty().getPartyMembers().contains(targetChar))
+			else if (activeChar.getParty().containsPlayer(targetChar))
 			{
 				activeChar.sendMessage("This player is a member of your own party.");
 				return;
 			}
 			
 			// Check if every player is ready for a duel
-			for (L2PcInstance temp : activeChar.getParty().getPartyMembers())
+			for (L2PcInstance temp : activeChar.getParty().getMembers())
 			{
 				if (!temp.canDuel())
 				{
@@ -110,7 +110,7 @@ public final class RequestDuelStart extends L2GameClientPacket
 				}
 			}
 			L2PcInstance partyLeader = null; // snatch party leader of targetChar's party
-			for (L2PcInstance temp : targetChar.getParty().getPartyMembers())
+			for (L2PcInstance temp : targetChar.getParty().getMembers())
 			{
 				if (partyLeader == null) partyLeader = temp;
 				if (!temp.canDuel())

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExAskJoinMPCC.java

@@ -66,7 +66,7 @@ public final class RequestExAskJoinMPCC extends L2GameClientPacket
 			if (activeParty.getLeader().equals(activeChar))
 			{
 				// if activeChars Party is in CC, is activeChar CCLeader?
-				if (activeParty.isInCommandChannel() && activeParty.getCommandChannel().getChannelLeader().equals(activeChar))
+				if (activeParty.isInCommandChannel() && activeParty.getCommandChannel().getLeader().equals(activeChar))
 				{
 					// in CC and the CCLeader
 					// target in a party?
@@ -92,7 +92,7 @@ public final class RequestExAskJoinMPCC extends L2GameClientPacket
 					}
 					
 				}
-				else if (activeParty.isInCommandChannel() && !activeParty.getCommandChannel().getChannelLeader().equals(activeChar))
+				else if (activeParty.isInCommandChannel() && !activeParty.getCommandChannel().getLeader().equals(activeChar))
 				{
 					// in CC, but not the CCLeader
 					sm = SystemMessage.getSystemMessage(SystemMessageId.CANNOT_INVITE_TO_COMMAND_CHANNEL);

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExOustFromMPCC.java

@@ -42,7 +42,7 @@ public final class RequestExOustFromMPCC extends L2GameClientPacket
 		
 		if (target != null && target.isInParty() && activeChar.isInParty() && activeChar.getParty().isInCommandChannel()
 				&& target.getParty().isInCommandChannel()
-				&& activeChar.getParty().getCommandChannel().getChannelLeader().equals(activeChar)
+				&& activeChar.getParty().getCommandChannel().getLeader().equals(activeChar)
 				&& activeChar.getParty().getCommandChannel().equals(target.getParty().getCommandChannel()))
 		{
 			if (activeChar.equals(target))
@@ -51,14 +51,14 @@ public final class RequestExOustFromMPCC extends L2GameClientPacket
 			target.getParty().getCommandChannel().removeParty(target.getParty());
 			
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DISMISSED_FROM_COMMAND_CHANNEL);
-			target.getParty().broadcastToPartyMembers(sm);
+			target.getParty().broadcastPacket(sm);
 			
 			// check if CC has not been canceled
 			if (activeChar.getParty().isInCommandChannel())
 			{
 				sm = SystemMessage.getSystemMessage(SystemMessageId.C1_PARTY_DISMISSED_FROM_COMMAND_CHANNEL);
 				sm.addString(target.getParty().getLeader().getName());
-				activeChar.getParty().getCommandChannel().broadcastToChannelMembers(sm);
+				activeChar.getParty().getCommandChannel().broadcastPacket(sm);
 			}
 		}
 		else

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestOustFromPartyRoom.java

@@ -55,7 +55,7 @@ public final class RequestOustFromPartyRoom extends L2GameClientPacket
 		if (_room.getOwner() != activeChar)
 			return;
 		
-		if (activeChar.isInParty() && member.isInParty() && activeChar.getParty().getPartyLeaderOID() == member.getParty().getPartyLeaderOID())
+		if (activeChar.isInParty() && member.isInParty() && activeChar.getParty().getLeaderObjectId() == member.getParty().getLeaderObjectId())
 		{
 			activeChar.sendPacket(SystemMessageId.CANNOT_DISMISS_PARTY_MEMBER);
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchList.java

@@ -91,7 +91,7 @@ public class RequestPartyMatchList extends L2GameClientPacket
 			
 			if (_activeChar.isInParty())
 			{
-				for (L2PcInstance ptmember : _activeChar.getParty().getPartyMembers())
+				for (L2PcInstance ptmember : _activeChar.getParty().getMembers())
 				{
 					if (ptmember == null)
 						continue;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRestart.java

@@ -105,7 +105,7 @@ public final class RequestRestart extends L2GameClientPacket
 			final L2Party playerParty = player.getParty();
 			
 			if (playerParty != null)
-				player.getParty().broadcastToPartyMembers(SystemMessage.sendString(player.getName() + " has been removed from the upcoming festival."));
+				player.getParty().broadcastString(player.getName() + " has been removed from the upcoming festival.");
 		}
 
 		for (PlayerDespawnListener listener : despawnListeners)

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java

@@ -50,7 +50,7 @@ public final class RequestWithdrawPartyRoom extends L2GameClientPacket
 		if (_room == null)
 			return;
 		
-		if((_activeChar.isInParty() && _room.getOwner().isInParty()) && (_activeChar.getParty().getPartyLeaderOID() == _room.getOwner().getParty().getPartyLeaderOID()))
+		if((_activeChar.isInParty() && _room.getOwner().isInParty()) && (_activeChar.getParty().getLeaderObjectId() == _room.getOwner().getParty().getLeaderObjectId()))
 		{
 			// If user is in party with Room Owner
 			// is not removed from Room

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java

@@ -39,7 +39,7 @@ public class ExMPCCPartyInfoUpdate extends L2GameServerPacket
 	{
 		_party = party;
 		_name = _party.getLeader().getName();
-		_LeaderOID = _party.getPartyLeaderOID();
+		_LeaderOID = _party.getLeaderObjectId();
 		_memberCount = _party.getMemberCount();
 		_mode = mode;
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java

@@ -39,7 +39,7 @@ public class ExMPCCShowPartyMemberInfo extends L2GameServerPacket
 		writeC(0xfe);
 		writeH(0x4b);
 		writeD(_party.getMemberCount()); // Number of Members
-		for(L2PcInstance pc : _party.getPartyMembers())
+		for(L2PcInstance pc : _party.getMembers())
 		{
 			writeS(pc.getName()); // Membername
 			writeD(pc.getObjectId()); // ObjId

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExManagePartyRoomMember.java

@@ -54,7 +54,7 @@ public class ExManagePartyRoomMember extends L2GameServerPacket
 			writeD(1);
 		else
 		{
-			if((_room.getOwner().isInParty() && _activeChar.isInParty()) && (_room.getOwner().getParty().getPartyLeaderOID() == _activeChar.getParty().getPartyLeaderOID()))
+			if((_room.getOwner().isInParty() && _activeChar.isInParty()) && (_room.getOwner().getParty().getLeaderObjectId() == _activeChar.getParty().getLeaderObjectId()))
 				writeD(2);
 			else
 				writeD(0);

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java

@@ -57,7 +57,7 @@ public class ExMultiPartyCommandChannelInfo extends L2GameServerPacket
 		writeC(0xfe);
 		writeH(0x31);
 		
-		writeS(_channel.getChannelLeader().getName()); // Channelowner
+		writeS(_channel.getLeader().getName()); // Channelowner
 		writeD(0); // Channelloot 0 or 1
 		writeD(_channel.getMemberCount());
 		
@@ -65,7 +65,7 @@ public class ExMultiPartyCommandChannelInfo extends L2GameServerPacket
 		for(L2Party p : _channel.getPartys())
 		{
 			writeS(p.getLeader().getName()); // Leadername
-			writeD(p.getPartyLeaderOID()); // Leaders ObjId
+			writeD(p.getLeaderObjectId()); // Leaders ObjId
 			writeD(p.getMemberCount()); // Membercount
 		}
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/ExPartyRoomMember.java

@@ -52,7 +52,7 @@ public class ExPartyRoomMember extends L2GameServerPacket
 				writeD(1);
 			else
 			{
-				if((_room.getOwner().isInParty() && _member.isInParty()) && (_room.getOwner().getParty().getPartyLeaderOID() == _member.getParty().getPartyLeaderOID()))
+				if((_room.getOwner().isInParty() && _member.isInParty()) && (_room.getOwner().getParty().getLeaderObjectId() == _member.getParty().getLeaderObjectId()))
 					writeD(2);
 				else
 					writeD(0);

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PartyMemberPosition.java

@@ -38,7 +38,7 @@ public class PartyMemberPosition extends L2GameServerPacket
 	public void reuse(L2Party party)
 	{
 		locations.clear();
-		for (L2PcInstance member : party.getPartyMembers())
+		for (L2PcInstance member : party.getMembers())
 		{
 			if (member == null)
 				continue;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowAdd.java

@@ -33,7 +33,7 @@ public final class PartySmallWindowAdd extends L2GameServerPacket
 	public PartySmallWindowAdd(L2PcInstance member, L2Party party)
 	{
 		_member = member;
-		_leaderId = party.getPartyLeaderOID();
+		_leaderId = party.getLeaderObjectId();
 		_distribution = party.getLootDistribution();
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowAll.java

@@ -43,7 +43,7 @@ public final class PartySmallWindowAll extends L2GameServerPacket
 	{
 		_exclude = exclude;
 		_party = party;
-		_LeaderOID = _party.getPartyLeaderOID();
+		_LeaderOID = _party.getLeaderObjectId();
 		_dist = _party.getLootDistribution();
 	}
 	
@@ -55,7 +55,7 @@ public final class PartySmallWindowAll extends L2GameServerPacket
 		writeD(_dist);
 		writeD(_party.getMemberCount() - 1);
 		
-		for (L2PcInstance member : _party.getPartyMembers())
+		for (L2PcInstance member : _party.getMembers())
 		{
 			if ((member != null) && (member != _exclude))
 			{