BETA: Reverting some changes from [5249]

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

@@ -172,21 +172,4 @@ public abstract class AbstractPlayerGroup
 		}
 		return true;
 	}
-	
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (getClass().equals(obj.getClass()))
-		{
-			return getLeader().equals(((AbstractPlayerGroup) obj).getLeader());
-			
-		}
-		return false;
-	}
-	
-	@Override
-	public int hashCode()
-	{
-		return getLeader().hashCode();
-	}
 }

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

@@ -774,20 +774,4 @@ public abstract class L2Object
 	{
 		return false;
 	}
-	
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (obj instanceof L2Object)
-		{
-			return _objectId == ((L2Object) obj)._objectId;
-		}
-		return false;
-	}
-	
-	@Override
-	public int hashCode()
-	{
-		return _objectId;
-	}
 }

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

@@ -266,7 +266,7 @@ public class L2Party extends AbstractPlayerGroup
 	 */
 	public boolean isLeader(L2PcInstance player)
 	{
-		return getLeader().equals(player);
+		return getLeader().getObjectId() == player.getObjectId();
 	}
 	
 	/**
@@ -321,7 +321,7 @@ public class L2Party extends AbstractPlayerGroup
 	{
 		for (L2PcInstance member : getMembers())
 		{
-			if ((member != null) && !member.equals(player))
+			if ((member != null) && member.getObjectId() != player.getObjectId())
 			{
 				member.sendPacket(msg);
 			}
@@ -525,7 +525,7 @@ public class L2Party extends AbstractPlayerGroup
 				if (isInCommandChannel())
 				{
 					// delete the whole command channel when the party who opened the channel is disbanded
-					if (getCommandChannel().getLeader().equals(getLeader()))
+					if (getCommandChannel().getLeader().getObjectId() == getLeader().getObjectId())
 					{
 						getCommandChannel().disbandChannel();
 					}
@@ -606,7 +606,7 @@ public class L2Party extends AbstractPlayerGroup
 					msg.addString(getLeader().getName());
 					broadcastPacket(msg);
 					broadcastToPartyMembersNewLeader();
-					if (isInCommandChannel() && temp.equals(_commandChannel.getLeader()))
+					if (isInCommandChannel() && temp.getObjectId() == _commandChannel.getLeader().getObjectId())
 					{
 						_commandChannel.setChannelLeader(getLeader());
 						msg = SystemMessage.getSystemMessage(SystemMessageId.COMMAND_CHANNEL_LEADER_NOW_C1);