From 371277846feb606fde272ba74201ad06807016e6 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 17 Sep 2020 23:33:31 +0000
Subject: [PATCH] Empty party null leader check.

---
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 .../org/l2jmobius/gameserver/model/AbstractPlayerGroup.java  | 5 +++++
 .../java/org/l2jmobius/gameserver/model/Party.java           | 4 ++++
 34 files changed, 153 insertions(+)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java
index bb6597926f..926155431e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java
@@ -1087,6 +1087,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Party.java
index bb6597926f..926155431e 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Party.java
@@ -1087,6 +1087,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java
index bb6597926f..926155431e 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java
@@ -1087,6 +1087,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java
index bb6597926f..926155431e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java
@@ -1087,6 +1087,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java
index 497483e187..a0a3e21590 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java
@@ -1076,6 +1076,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java
index 497483e187..a0a3e21590 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java
@@ -1076,6 +1076,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java
index 497483e187..a0a3e21590 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java
@@ -1076,6 +1076,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java
index ae71d2626f..64b97cfa47 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java
@@ -1083,6 +1083,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 29551e5e54..50cc18077f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -67,6 +67,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java
index 89b76a61de..234103d129 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java
@@ -955,6 +955,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git 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
index 29551e5e54..50cc18077f 100644
--- 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
@@ -67,6 +67,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java
index de08663390..5a9f2fbc30 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java
@@ -973,6 +973,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java
index bb6597926f..926155431e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java
@@ -1087,6 +1087,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java
index bb6597926f..926155431e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java
@@ -1087,6 +1087,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java
index bb6597926f..926155431e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java
@@ -1087,6 +1087,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java
index bb6597926f..926155431e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java
@@ -1087,6 +1087,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java
index bb6597926f..926155431e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java
@@ -1087,6 +1087,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java
index bb6597926f..926155431e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java
@@ -1087,6 +1087,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
index 0425e2e972..aa6aba7dcc 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java
@@ -68,6 +68,11 @@ public abstract class AbstractPlayerGroup
 	 */
 	public int getLeaderObjectId()
 	{
+		final PlayerInstance leader = getLeader();
+		if (leader == null)
+		{
+			return 0;
+		}
 		return getLeader().getObjectId();
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java
index bb6597926f..926155431e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java
@@ -1087,6 +1087,10 @@ public class Party extends AbstractPlayerGroup
 	@Override
 	public PlayerInstance getLeader()
 	{
+		if (_members.isEmpty())
+		{
+			return null;
+		}
 		return _members.get(0);
 	}