From 9b24b0ec01e96a3ff2e62f608fe808af6f8a0558 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <mobius@cyber-wizard.com>
Date: Fri, 27 Dec 2024 10:37:53 +0200
Subject: [PATCH] Online player check for duels. Contributed by xionati.

---
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 .../java/org/l2jmobius/gameserver/model/Duel.java               | 2 +-
 35 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Duel.java
index b2157667f1..3b793fa0ad 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/Duel.java
index 6396e4bed8..76af16e5bb 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/Duel.java
index 732017e958..b20f52b80c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/model/Duel.java
index 732017e958..b20f52b80c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_11.3_Shinemaker/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_11.3_Shinemaker/java/org/l2jmobius/gameserver/model/Duel.java
index 732017e958..b20f52b80c 100644
--- a/L2J_Mobius_11.3_Shinemaker/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_11.3_Shinemaker/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_12.1_PathOfRogue/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_12.1_PathOfRogue/java/org/l2jmobius/gameserver/model/Duel.java
index d4e8ac44fd..4bf8dbaa24 100644
--- a/L2J_Mobius_12.1_PathOfRogue/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_12.1_PathOfRogue/java/org/l2jmobius/gameserver/model/Duel.java
@@ -871,7 +871,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/Duel.java
index b32ecc87e9..f727c8cd0d 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/Duel.java
@@ -848,7 +848,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Duel.java
index 7cf12ff896..ae882a9eef 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Duel.java
@@ -848,7 +848,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Duel.java
index e032074f80..a4cb5af0d8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Duel.java
@@ -865,7 +865,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Duel.java
index ec7b823028..b85cac4a1d 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Duel.java
index 6396e4bed8..76af16e5bb 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Duel.java
index 6396e4bed8..76af16e5bb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/Duel.java
index 6396e4bed8..76af16e5bb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/Duel.java
index 732017e958..b20f52b80c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/model/Duel.java
index 732017e958..b20f52b80c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Essence_7.3_SevenSigns/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Essence_7.3_SevenSigns/java/org/l2jmobius/gameserver/model/Duel.java
index 732017e958..b20f52b80c 100644
--- a/L2J_Mobius_Essence_7.3_SevenSigns/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Essence_7.3_SevenSigns/java/org/l2jmobius/gameserver/model/Duel.java
@@ -867,7 +867,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}
diff --git a/L2J_Mobius_Essence_8.1_HighElves/java/org/l2jmobius/gameserver/model/Duel.java b/L2J_Mobius_Essence_8.1_HighElves/java/org/l2jmobius/gameserver/model/Duel.java
index d4e8ac44fd..4bf8dbaa24 100644
--- a/L2J_Mobius_Essence_8.1_HighElves/java/org/l2jmobius/gameserver/model/Duel.java
+++ b/L2J_Mobius_Essence_8.1_HighElves/java/org/l2jmobius/gameserver/model/Duel.java
@@ -871,7 +871,7 @@ public class Duel
 	public DuelResult checkEndDuelCondition()
 	{
 		// one of the players might leave during duel
-		if ((_playerA == null) || (_playerB == null))
+		if ((_playerA == null) || (_playerB == null) || !_playerA.isOnline() || !_playerB.isOnline())
 		{
 			return DuelResult.CANCELED;
 		}