From a3c293d43d5e3d619fed2e9cf17097df2d21d1c5 Mon Sep 17 00:00:00 2001
From: HorridoJoho <HorridoJoho@users.noreply.github.com>
Date: Sun, 26 Jun 2016 19:51:32 +0200
Subject: [PATCH] Bug: You can banish castle foreigners durring territory war.
This commit fixes a bug where you can banish castle foreigners during
territory war.
Reported By: @l2mmo3d
Patch By: @l2mmo3d
---
.../ai/npc/CastleChamberlain/CastleChamberlain.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java b/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
index 42ecacab03..52d8e087fd 100644
--- a/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
+++ b/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
@@ -25,14 +25,13 @@ import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-import ai.npc.AbstractNpcAI;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.SevenSigns;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.TeleportLocationTable;
import com.l2jserver.gameserver.instancemanager.CastleManorManager;
import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
import com.l2jserver.gameserver.model.ClanPrivilege;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2TeleportLocation;
@@ -63,6 +62,8 @@ import com.l2jserver.gameserver.network.serverpackets.ExShowSeedSetting;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.util.Util;
+import ai.npc.AbstractNpcAI;
+
/**
* Castle Chamberlain AI.
* @author malyelfik
@@ -86,6 +87,7 @@ public final class CastleChamberlain extends AbstractNpcAI
private static final int CROWN = 6841;
// Fortress
private static final Map<Integer, List<Integer>> FORTRESS = new HashMap<>();
+
static
{
FORTRESS.put(1, Arrays.asList(101, 102, 112, 113)); // Gludio Castle
@@ -98,6 +100,7 @@ public final class CastleChamberlain extends AbstractNpcAI
FORTRESS.put(8, Arrays.asList(110, 120, 121)); // Rune Castle
FORTRESS.put(9, Arrays.asList(111, 121)); // Schuttgart Castle
}
+
// Buffs
private static final SkillHolder[] BUFFS =
{
@@ -880,7 +883,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_DISMISS))
{
- if (castle.getSiege().isInProgress())
+ if (castle.getSiege().isInProgress() || TerritoryWarManager.getInstance().isTWInProgress())
{
htmltext = "chamberlain-08.html";
}
--
GitLab