From eca90576f898e43e2d478b55dfbe148d71284349 Mon Sep 17 00:00:00 2001
From: Rumen Nikiforov <unafraid89@gmail.com>
Date: Wed, 29 Jan 2014 23:45:13 +0000
Subject: [PATCH] BETA: Renaming `IL2Procedure` to `IProcedure` * Also adding
generic return type.
---
.../dist/game/data/scripts/instances/Kamaloka/Kamaloka.java | 6 +++---
.../Q10290_LandDragonConqueror.java | 6 +++---
.../Q10291_FireDragonDestroyer.java | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 375b3e02bf..baa137bb51 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Instance;
import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.L2Skill;
@@ -1183,10 +1183,10 @@ public final class Kamaloka extends Quest
31340
};
- private static final IL2Procedure<BuffInfo> REMOVE_BUFFS = new IL2Procedure<BuffInfo>()
+ private static final IProcedure<BuffInfo, Boolean> REMOVE_BUFFS = new IProcedure<BuffInfo, Boolean>()
{
@Override
- public boolean execute(BuffInfo info)
+ public Boolean execute(BuffInfo info)
{
if ((info != null) && !info.getSkill().isStayAfterDeath() && (Arrays.binarySearch(BUFFS_WHITELIST, info.getSkill().getId()) < 0))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
index 8e9cdb7836..77fca54d2b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
@@ -20,7 +20,7 @@ package quests.Q10290_LandDragonConqueror;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.util.Util;
*/
public final class Q10290_LandDragonConqueror extends Quest
{
- public class RewardCheck implements IL2Procedure<L2PcInstance>
+ public class RewardCheck implements IProcedure<L2PcInstance, Boolean>
{
private final L2Npc _npc;
@@ -42,7 +42,7 @@ public final class Q10290_LandDragonConqueror extends Quest
}
@Override
- public boolean execute(L2PcInstance member)
+ public Boolean execute(L2PcInstance member)
{
if (Util.checkIfInRange(8000, _npc, member, false))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index 92a4286083..5a08ee5b94 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -20,7 +20,7 @@ package quests.Q10291_FireDragonDestroyer;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.util.Util;
*/
public class Q10291_FireDragonDestroyer extends Quest
{
- public class RewardCheck implements IL2Procedure<L2PcInstance>
+ public class RewardCheck implements IProcedure<L2PcInstance, Boolean>
{
private final L2Npc _npc;
@@ -42,7 +42,7 @@ public class Q10291_FireDragonDestroyer extends Quest
}
@Override
- public boolean execute(L2PcInstance member)
+ public Boolean execute(L2PcInstance member)
{
if (Util.checkIfInRange(8000, _npc, member, false))
{
--
GitLab