From 632a2a1e8fc5f2a6620880bfe1b8f94e37ff6847 Mon Sep 17 00:00:00 2001
From: Ahmed <Ahmed@5288da4f-0efc-0310-bd40-8d490a2659fa>
Date: Sat, 8 Sep 2012 22:29:20 +0000
Subject: [PATCH] BETA: Castle and Fort skills fix. * DataPack-Part for [L5624]
Patch by: Nik
Tested by: Tavo22
Reviewed by: Ahmed
---
.../data/scripts/handlers/skillhandlers/TakeCastle.java | 6 +++---
.../game/data/scripts/handlers/skillhandlers/TakeFort.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java
index 81f487ce5c..2cc84e7525 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java
@@ -36,7 +36,7 @@ public class TakeCastle implements ISkillHandler
@Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
- if (!activeChar.isPlayer())
+ if (!activeChar.isPlayer() || targets.length == 0)
return;
L2PcInstance player = activeChar.getActingPlayer();
@@ -45,7 +45,7 @@ public class TakeCastle implements ISkillHandler
return;
Castle castle = CastleManager.getInstance().getCastle(player);
- if (castle == null || !player.checkIfOkToCastSealOfRule(castle, true, skill))
+ if (castle == null || !player.checkIfOkToCastSealOfRule(castle, true, skill, targets[0]))
return;
try
@@ -68,4 +68,4 @@ public class TakeCastle implements ISkillHandler
{
new TakeCastle();
}
-}
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java
index 900f840e3d..056b2e5777 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java
@@ -36,7 +36,7 @@ public class TakeFort implements ISkillHandler
@Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
- if (!activeChar.isPlayer())
+ if (!activeChar.isPlayer() || targets.length == 0)
return;
L2PcInstance player = activeChar.getActingPlayer();
@@ -44,7 +44,7 @@ public class TakeFort implements ISkillHandler
return;
Fort fort = FortManager.getInstance().getFort(player);
- if (fort == null || !player.checkIfOkToCastFlagDisplay(fort, true, skill))
+ if (fort == null || !player.checkIfOkToCastFlagDisplay(fort, true, skill, targets[0]))
return;
try
@@ -67,4 +67,4 @@ public class TakeFort implements ISkillHandler
{
new TakeFort();
}
-}
+}
\ No newline at end of file
--
GitLab