From 9f1b9ea7597b634889957ef959dc419e9ac08fa8 Mon Sep 17 00:00:00 2001
From: Rumen Nikiforov <unafraid89@gmail.com>
Date: Thu, 20 Mar 2014 18:23:44 +0000
Subject: [PATCH] BETA: DP-Part for [L6484]
---
.../data/scripts/ai/individual/Ballista.java | 2 +-
.../scripts/ai/individual/Venom/Venom.java | 2 +-
.../CastleChamberlain/CastleChamberlain.java | 28 +++++++++----------
.../CastleMercenaryManager.java | 2 +-
.../CastleSiegeManager.java | 2 +-
.../CastleTeleporter/CastleTeleporter.java | 4 +--
.../MercenaryCaptain/MercenaryCaptain.java | 4 +--
.../ai/npc/WyvernManager/WyvernManager.java | 2 +-
.../actionhandlers/L2DoorInstanceAction.java | 2 +-
.../handlers/itemhandlers/MercTicket.java | 2 +-
.../usercommandhandlers/SiegeStatus.java | 2 +-
.../voicedcommandhandlers/CastleVCmd.java | 4 +--
.../voicedcommandhandlers/Wedding.java | 6 ++--
13 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Ballista.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Ballista.java
index 75105ed09d..7b82a71124 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Ballista.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Ballista.java
@@ -76,7 +76,7 @@ public final class Ballista extends AbstractNpcAI
{
if ((skill != null) && (caster.getTarget() == npc) && (getRandom(100) < 40) && (skill == BOMB.getSkill()))
{
- if (npc.getFort().getSiege().getIsInProgress())
+ if (npc.getFort().getSiege().isInProgress())
{
if ((caster.getClan() != null) && (caster.getClan().getLevel() >= MIN_CLAN_LV))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java
index 793653ff3a..5dbbb03357 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java
@@ -332,7 +332,7 @@ public final class Venom extends AbstractNpcAI
{
updateStatus(DEAD);
broadcastNpcSay(npc, Say2.NPC_SHOUT, NpcStringId.ITS_NOT_OVER_YET_IT_WONT_BE_OVER_LIKE_THIS_NEVER);
- if (!CastleManager.getInstance().getCastleById(CASTLE).getSiege().getIsInProgress())
+ if (!CastleManager.getInstance().getCastleById(CASTLE).getSiege().isInProgress())
{
L2Npc cube = addSpawn(TELEPORT_CUBE, CUBE, false, 0);
startQuestTimer("cube_despawn", 120000, cube, null);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
index d9fdae335a..1db2f39852 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
@@ -447,7 +447,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS))
{
- if (castle.getSiege().getIsInProgress())
+ if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-08.html";
}
@@ -518,7 +518,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS))
{
- if (castle.getSiege().getIsInProgress())
+ if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-08.html";
}
@@ -616,7 +616,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS))
{
- if (castle.getSiege().getIsInProgress())
+ if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-08.html";
}
@@ -655,7 +655,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
if (npc.isMyLord(player))
{
- if (castle.getSiege().getIsInProgress())
+ if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-07.html";
}
@@ -696,7 +696,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES))
{
- if (castle.getSiege().getIsInProgress())
+ if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-08.html";
}
@@ -726,7 +726,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES))
{
- if (castle.getSiege().getIsInProgress())
+ if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-08.html";
}
@@ -827,7 +827,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
htmltext = "chamberlain-21.html";
}
- else if (castle.getSiege().getIsInProgress())
+ else if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-08.html";
}
@@ -843,7 +843,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
htmltext = "chamberlain-21.html";
}
- else if (castle.getSiege().getIsInProgress())
+ else if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-08.html";
}
@@ -857,7 +857,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_DISMISS))
{
- if (castle.getSiege().getIsInProgress())
+ if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-08.html";
}
@@ -879,7 +879,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
htmltext = "chamberlain-21.html";
}
- else if (castle.getSiege().getIsInProgress())
+ else if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-08.html";
}
@@ -895,7 +895,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
htmltext = "chamberlain-21.html";
}
- else if (castle.getSiege().getIsInProgress())
+ else if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-08.html";
}
@@ -1196,7 +1196,7 @@ public final class CastleChamberlain extends AbstractNpcAI
}
case "give_crown":
{
- if (castle.getSiege().getIsInProgress())
+ if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-08.html";
}
@@ -1225,7 +1225,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
if (npc.isMyLord(player))
{
- if (castle.getSiege().getIsInProgress())
+ if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-08.html";
}
@@ -1263,7 +1263,7 @@ public final class CastleChamberlain extends AbstractNpcAI
{
if (npc.isMyLord(player))
{
- if (castle.getSiege().getIsInProgress())
+ if (castle.getSiege().isInProgress())
{
htmltext = "chamberlain-08.html";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
index 53f9d9d618..3daccda0ce 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
@@ -119,7 +119,7 @@ public final class CastleMercenaryManager extends AbstractNpcAI
final String htmltext;
if (player.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS) || ((player.getClanId() == npc.getCastle().getOwnerId()) && player.hasClanPrivilege(ClanPrivilege.CS_MERCENARIES)))
{
- if (npc.getCastle().getSiege().getIsInProgress())
+ if (npc.getCastle().getSiege().isInProgress())
{
htmltext = "mercmanager-siege.html";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java
index a3d1e2db89..0ee67d951c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java
@@ -90,7 +90,7 @@ public final class CastleSiegeManager extends AbstractNpcAI
{
return true;
}
- else if (npc.getCastle().getSiege().getIsInProgress())
+ else if (npc.getCastle().getSiege().isInProgress())
{
return true;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java
index c30eb28029..155903bd03 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java
@@ -65,7 +65,7 @@ public final class CastleTeleporter extends AbstractNpcAI
if (npc.isScriptValue(0))
{
final Siege siege = npc.getCastle().getSiege();
- final int time = (siege.getIsInProgress() && (siege.getControlTowerCount() == 0)) ? 480000 : 30000;
+ final int time = (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? 480000 : 30000;
startQuestTimer("teleport", time, npc, null);
npc.setScriptValue(1);
}
@@ -94,7 +94,7 @@ public final class CastleTeleporter extends AbstractNpcAI
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
final Siege siege = npc.getCastle().getSiege();
- return (npc.isScriptValue(0)) ? (siege.getIsInProgress() && (siege.getControlTowerCount() == 0)) ? "teleporter-02.html" : "teleporter-01.html" : "teleporter-03.html";
+ return (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "teleporter-02.html" : "teleporter-01.html" : "teleporter-03.html";
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java
index 4c1c0ebf49..8118e96c23 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java
@@ -217,11 +217,11 @@ public final class MercenaryCaptain extends AbstractNpcAI
}
else if (npc.isMyLord(player))
{
- htmltext = (npc.getCastle().getSiege().getIsInProgress() || TerritoryWarManager.getInstance().isTWInProgress()) ? "36481-05.html" : "36481-04.html";
+ htmltext = (npc.getCastle().getSiege().isInProgress() || TerritoryWarManager.getInstance().isTWInProgress()) ? "36481-05.html" : "36481-04.html";
}
else
{
- htmltext = (npc.getCastle().getSiege().getIsInProgress() || TerritoryWarManager.getInstance().isTWInProgress()) ? "36481-06.html" : npc.getId() + "-01.html";
+ htmltext = (npc.getCastle().getSiege().isInProgress() || TerritoryWarManager.getInstance().isTWInProgress()) ? "36481-06.html" : npc.getId() + "-01.html";
}
return htmltext;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
index 18c32e1f62..0c96eb1e35 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
@@ -169,7 +169,7 @@ public final class WyvernManager extends AbstractNpcAI
case CLAN_HALL:
{
SiegableHall hall = npc.getConquerableHall();
- return (hall != null) ? hall.isInSiege() : npc.getCastle().getSiege().getIsInProgress();
+ return (hall != null) ? hall.isInSiege() : npc.getCastle().getSiege().isInProgress();
}
case FORT:
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java
index a98ff9b2e4..679ef9b7f7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java
@@ -71,7 +71,7 @@ public class L2DoorInstanceAction implements IActionHandler
}
}
}
- else if ((activeChar.getClan() != null) && (((L2DoorInstance) target).getFort() != null) && (activeChar.getClan() == ((L2DoorInstance) target).getFort().getOwnerClan()) && ((L2DoorInstance) target).isOpenableBySkill() && !((L2DoorInstance) target).getFort().getSiege().getIsInProgress())
+ else if ((activeChar.getClan() != null) && (((L2DoorInstance) target).getFort() != null) && (activeChar.getClan() == ((L2DoorInstance) target).getFort().getOwnerClan()) && ((L2DoorInstance) target).isOpenableBySkill() && !((L2DoorInstance) target).getFort().getSiege().isInProgress())
{
if (!((L2Character) target).isInsideRadius(activeChar, L2Npc.INTERACTION_DISTANCE, false, false))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
index d373b52684..b9db37cd29 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
@@ -63,7 +63,7 @@ public class MercTicket implements IItemHandler
activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_AUTHORITY_TO_POSITION_MERCENARIES);
return false;
}
- else if ((castle != null) && castle.getSiege().getIsInProgress())
+ else if ((castle != null) && castle.getSiege().isInProgress())
{
activeChar.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE);
return false;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java
index 5fcf60bc28..69bc03b14a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java
@@ -56,7 +56,7 @@ public class SiegeStatus implements IUserCommandHandler
for (Siege siege : SiegeManager.getInstance().getSieges())
{
- if (!siege.getIsInProgress())
+ if (!siege.isInProgress())
{
continue;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
index bddbb4e0e3..14d0d0af02 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
@@ -69,7 +69,7 @@ public class CastleVCmd implements IVoicedCommandHandler
return false;
}
- if (castle.getSiege().getIsInProgress())
+ if (castle.getSiege().isInProgress())
{
activeChar.sendPacket(SystemMessageId.GATES_NOT_OPENED_CLOSED_DURING_SIEGE);
return false;
@@ -105,7 +105,7 @@ public class CastleVCmd implements IVoicedCommandHandler
return false;
}
- if (castle2.getSiege().getIsInProgress())
+ if (castle2.getSiege().isInProgress())
{
activeChar.sendPacket(SystemMessageId.GATES_NOT_OPENED_CLOSED_DURING_SIEGE);
return false;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
index f73bc975e9..3ee438086c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
@@ -317,7 +317,7 @@ public class Wedding implements IVoicedCommandHandler
return false;
}
- if ((SiegeManager.getInstance().getSiege(activeChar) != null) && SiegeManager.getInstance().getSiege(activeChar).getIsInProgress())
+ if ((SiegeManager.getInstance().getSiege(activeChar) != null) && SiegeManager.getInstance().getSiege(activeChar).isInProgress())
{
activeChar.sendMessage("You are in a siege, you cannot go to your partner.");
return false;
@@ -415,7 +415,7 @@ public class Wedding implements IVoicedCommandHandler
return false;
}
- if ((SiegeManager.getInstance().getSiege(partner) != null) && SiegeManager.getInstance().getSiege(partner).getIsInProgress())
+ if ((SiegeManager.getInstance().getSiege(partner) != null) && SiegeManager.getInstance().getSiege(partner).isInProgress())
{
activeChar.sendMessage("Your partner is in a siege, you cannot go to your partner.");
return false;
@@ -501,7 +501,7 @@ public class Wedding implements IVoicedCommandHandler
return;
}
- if ((SiegeManager.getInstance().getSiege(_partnerLoc) != null) && SiegeManager.getInstance().getSiege(_partnerLoc).getIsInProgress())
+ if ((SiegeManager.getInstance().getSiege(_partnerLoc) != null) && SiegeManager.getInstance().getSiege(_partnerLoc).isInProgress())
{
_activeChar.sendMessage("Your partner is in siege, you can't go to your partner.");
return;
--
GitLab