From a3378dd942fda3cc66fd8c2e10e7c25273473c99 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 1 Jul 2022 23:31:59 +0000
Subject: [PATCH] Changed ClanWar getRemainingTime method used by
 PledgeReceiveWarList. Contributed by Index.

---
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 .../java/org/l2jmobius/gameserver/model/clan/ClanWar.java       | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index ea66c21c6a..19ff108e3c 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index d035db80b3..a5b24cb082 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index d035db80b3..a5b24cb082 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 0692cd2014..b3897b4b2e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index eb35d76524..0a3d8212ec 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index eb35d76524..0a3d8212ec 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 44eb7858ad..9ad82673f7 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 44eb7858ad..9ad82673f7 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index cd39cde48c..7f4c600b42 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index cd39cde48c..7f4c600b42 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index cd39cde48c..7f4c600b42 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index cd39cde48c..7f4c600b42 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 1750f6c957..6ed237440e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 1750f6c957..6ed237440e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index cea6477534..72ba4b2c3a 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index cea6477534..72ba4b2c3a 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -280,7 +280,7 @@ public class ClanWar
 	
 	public int getRemainingTime()
 	{
-		return (int) TimeUnit.SECONDS.convert(_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR, TimeUnit.MILLISECONDS);
+		return (int) (((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public Clan getOpposingClan(Clan clan)