Null checks for AbstractPlayerGroup isLeader method.

2021-07-31 00:08:35 +00:00
parent 13b9f0c499
commit ec9cdcced0
23 changed files with 276 additions and 23 deletions
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -82,7 +82,18 @@ public abstract class AbstractPlayerGroup
 	 */
 	public boolean isLeader(PlayerInstance player)
 	{
-		return getLeader().getObjectId() == player.getObjectId();
+		if (player == null)
+		{
+			return false;
+		}
+		
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return false;
+		}
+		
+		return leader.getObjectId() == player.getObjectId();
 	}
 	
 	/**