From e7e40453ecb0e216dde285786f7e4f03abd599f3 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sun, 25 Aug 2013 22:38:07 +0000
Subject: [PATCH] BETA: Datapack part for [L6181]. * Cleanup.
---
.../game/data/scripts/handlers/skillhandlers/Unlock.java | 9 +--------
.../data/scripts/handlers/targethandlers/Unlockable.java | 9 ---------
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
index 074cf758c2..23dc5ef5e3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
@@ -43,13 +43,6 @@ public class Unlock implements ISkillHandler
@Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
- L2Object[] targetList = skill.getTargetList(activeChar);
-
- if (targetList == null)
- {
- return;
- }
-
for (L2Object target : targets)
{
if (target.isDoor())
@@ -88,7 +81,7 @@ public class Unlock implements ISkillHandler
return;
}
- if (doorUnlock(skill) && (!door.getOpen()))
+ if (doorUnlock(skill) && !door.getOpen())
{
door.openMe();
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Unlockable.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Unlockable.java
index 9e4fe3df6c..38673185fc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Unlockable.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Unlockable.java
@@ -18,9 +18,6 @@
*/
package handlers.targethandlers;
-import java.util.ArrayList;
-import java.util.List;
-
import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Character;
@@ -36,17 +33,11 @@ public class Unlockable implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- List<L2Character> targetList = new ArrayList<>();
if ((target == null) || (!target.isDoor() && !(target instanceof L2ChestInstance)))
{
return EMPTY_TARGET_LIST;
}
- if (!onlyFirst)
- {
- targetList.add(target);
- return targetList.toArray(new L2Object[targetList.size()]);
- }
return new L2Character[]
{
target
--
GitLab