From b82d85eba12966385980d001e03630e0c684a89f Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 6 Jan 2020 13:54:00 +0000
Subject: [PATCH] Proper showSiegeInfoWindow checks.

---
 .../actor/instance/FortMerchantInstance.java    | 17 +++++++----------
 .../model/actor/instance/SiegeNpcInstance.java  | 17 +++++++----------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortMerchantInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortMerchantInstance.java
index a4a12cfbae..aef73bc416 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortMerchantInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortMerchantInstance.java
@@ -20,6 +20,7 @@ import java.util.StringTokenizer;
 
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
+import org.l2jmobius.gameserver.model.entity.siege.FortSiege;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -147,11 +148,8 @@ public class FortMerchantInstance extends NpcWalkerInstance
 	 */
 	public void showSiegeInfoWindow(PlayerInstance player)
 	{
-		if (validateCondition(player))
-		{
-			getFort().getSiege().listRegisterClan(player);
-		}
-		else
+		final FortSiege siege = getFort().getSiege();
+		if (siege.getIsInProgress())
 		{
 			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 			html.setFile("data/html/fortress/merchant-busy.htm");
@@ -160,10 +158,9 @@ public class FortMerchantInstance extends NpcWalkerInstance
 			player.sendPacket(html);
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 		}
-	}
-	
-	private boolean validateCondition(PlayerInstance player)
-	{
-		return !getFort().getSiege().getIsInProgress();
+		else
+		{
+			siege.listRegisterClan(player);
+		}
 	}
 }
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeNpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeNpcInstance.java
index 6bdd115a20..c8d12eb10c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeNpcInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeNpcInstance.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.model.actor.instance;
 
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
+import org.l2jmobius.gameserver.model.entity.siege.Siege;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -74,11 +75,8 @@ public class SiegeNpcInstance extends FolkInstance
 	 */
 	public void showSiegeInfoWindow(PlayerInstance player)
 	{
-		if (validateCondition(player))
-		{
-			getCastle().getSiege().listRegisterClan(player);
-		}
-		else
+		final Siege siege = getCastle().getSiege();
+		if (siege.getIsInProgress())
 		{
 			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 			html.setFile("data/html/siege/" + getTemplate().npcId + "-busy.htm");
@@ -87,10 +85,9 @@ public class SiegeNpcInstance extends FolkInstance
 			player.sendPacket(html);
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 		}
-	}
-	
-	private boolean validateCondition(PlayerInstance player)
-	{
-		return getCastle().getSiege().getIsInProgress();
+		else
+		{
+			siege.listRegisterClan(player);
+		}
 	}
 }