BETA: Renaming `IL2Procedure` to `IProcedure`

	* Also adding generic return type.

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSigns.java

@@ -43,7 +43,7 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.TeleportWhereType;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Castle;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SSQInfo;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -1432,7 +1432,7 @@ public class SevenSigns
 		L2World.getInstance().forEachPlayer(new TeleLosingCabalFromDungeons(compWinner));
 	}
 	
-	private final class TeleLosingCabalFromDungeons implements IL2Procedure<L2PcInstance>
+	private final class TeleLosingCabalFromDungeons implements IProcedure<L2PcInstance, Boolean>
 	{
 		private final String _cmpWinner;
 		
@@ -1442,7 +1442,7 @@ public class SevenSigns
 		}
 		
 		@Override
-		public final boolean execute(final L2PcInstance onlinePlayer)
+		public final Boolean execute(final L2PcInstance onlinePlayer)
 		{
 			if (onlinePlayer != null)
 			{
@@ -1658,7 +1658,7 @@ public class SevenSigns
 		L2World.getInstance().forEachPlayer(new GiveCPMult(StrifeOwner));
 	}
 	
-	private final class GiveCPMult implements IL2Procedure<L2PcInstance>
+	private final class GiveCPMult implements IProcedure<L2PcInstance, Boolean>
 	{
 		private final int _strifeOwner;
 		
@@ -1668,7 +1668,7 @@ public class SevenSigns
 		}
 		
 		@Override
-		public final boolean execute(final L2PcInstance character)
+		public final Boolean execute(final L2PcInstance character)
 		{
 			if (character != null)
 			{
@@ -1696,10 +1696,10 @@ public class SevenSigns
 		L2World.getInstance().forEachPlayer(new RemoveCPMult());
 	}
 	
-	protected final class RemoveCPMult implements IL2Procedure<L2PcInstance>
+	protected final class RemoveCPMult implements IProcedure<L2PcInstance, Boolean>
 	{
 		@Override
-		public final boolean execute(final L2PcInstance character)
+		public final Boolean execute(final L2PcInstance character)
 		{
 			if (character != null)
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSignsFestival.java

@@ -54,7 +54,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2FestivalMonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -2471,10 +2471,10 @@ public class SevenSignsFestival implements SpawnListener
 		}
 	}
 	
-	protected final class ForEachPlayerRemoveUnusedBloodOfferings implements IL2Procedure<L2PcInstance>
+	protected final class ForEachPlayerRemoveUnusedBloodOfferings implements IProcedure<L2PcInstance, Boolean>
 	{
 		@Override
-		public final boolean execute(final L2PcInstance onlinePlayer)
+		public final Boolean execute(final L2PcInstance onlinePlayer)
 		{
 			try
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/Shutdown.java

@@ -39,7 +39,7 @@ import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Hero;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 import com.l2jserver.gameserver.model.olympiad.Olympiad;
 import com.l2jserver.gameserver.network.L2GameClient;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -590,12 +590,12 @@ public class Shutdown extends Thread
 		L2World.getInstance().forEachPlayer(new DisconnectAllCharacters());
 	}
 	
-	protected final class DisconnectAllCharacters implements IL2Procedure<L2PcInstance>
+	protected final class DisconnectAllCharacters implements IProcedure<L2PcInstance, Boolean>
 	{
 		private final Logger _log = Logger.getLogger(DisconnectAllCharacters.class.getName());
 		
 		@Override
-		public final boolean execute(final L2PcInstance player)
+		public final Boolean execute(final L2PcInstance player)
 		{
 			if (player != null)
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SpawnTable.java

@@ -43,7 +43,7 @@ import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 
 /**
  * Spawn data retriever.
@@ -497,7 +497,7 @@ public final class SpawnTable extends DocumentParser
 	 * @param procedure the procedure to execute
 	 * @return {@code true} if all procedures were executed, {@code false} otherwise
 	 */
-	public boolean forEachSpawn(IL2Procedure<L2Spawn> procedure)
+	public boolean forEachSpawn(IProcedure<L2Spawn, Boolean> procedure)
 	{
 		for (Set<L2Spawn> set : _spawnTable.values())
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java

@@ -25,7 +25,7 @@ import javolution.util.FastMap;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.actor.L2Character;
 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.network.L2GameClient;
 import com.l2jserver.util.L2FastMap;
 import com.l2jserver.util.L2HashMap;
@@ -310,7 +310,7 @@ public final class AntiFeedManager
 		}
 	}
 	
-	private static final class DisconnectProcedure implements IL2Procedure<Map<Integer, Connections>>
+	private static final class DisconnectProcedure implements IProcedure<Map<Integer, Connections>, Boolean>
 	{
 		private final Integer _addrHash;
 		
@@ -320,7 +320,7 @@ public final class AntiFeedManager
 		}
 		
 		@Override
-		public final boolean execute(Map<Integer, Connections> event)
+		public final Boolean execute(Map<Integer, Connections> event)
 		{
 			final Connections conns = event.get(_addrHash);
 			if (conns != null)

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/BoatManager.java

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.VehiclePathPoint;
 import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
 
 public class BoatManager
@@ -179,7 +179,7 @@ public class BoatManager
 		L2World.getInstance().forEachPlayer(new ForEachPlayerBroadcastPackets(point1, point2, packets));
 	}
 	
-	private final class ForEachPlayerBroadcastPackets implements IL2Procedure<L2PcInstance>
+	private final class ForEachPlayerBroadcastPackets implements IProcedure<L2PcInstance, Boolean>
 	{
 		VehiclePathPoint _point1, _point2;
 		L2GameServerPacket[] _packets;
@@ -192,7 +192,7 @@ public class BoatManager
 		}
 		
 		@Override
-		public final boolean execute(final L2PcInstance player)
+		public final Boolean execute(final L2PcInstance player)
 		{
 			if (player != null)
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/AbstractPlayerGroup.java

@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 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.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
@@ -45,10 +45,10 @@ public abstract class AbstractPlayerGroup
 	public List<Integer> getMembersObjectId()
 	{
 		final List<Integer> ids = new ArrayList<>();
-		forEachMember(new IL2Procedure<L2PcInstance>()
+		forEachMember(new IProcedure<L2PcInstance, Boolean>()
 		{
 			@Override
-			public boolean execute(L2PcInstance member)
+			public Boolean execute(L2PcInstance member)
 			{
 				ids.add(member.getObjectId());
 				return true;
@@ -105,10 +105,10 @@ public abstract class AbstractPlayerGroup
 	 */
 	public void broadcastPacket(final L2GameServerPacket packet)
 	{
-		forEachMember(new IL2Procedure<L2PcInstance>()
+		forEachMember(new IProcedure<L2PcInstance, Boolean>()
 		{
 			@Override
-			public boolean execute(L2PcInstance member)
+			public Boolean execute(L2PcInstance member)
 			{
 				if (member != null)
 				{
@@ -139,10 +139,10 @@ public abstract class AbstractPlayerGroup
 	
 	public void broadcastCreatureSay(final CreatureSay msg, final L2PcInstance broadcaster)
 	{
-		forEachMember(new IL2Procedure<L2PcInstance>()
+		forEachMember(new IProcedure<L2PcInstance, Boolean>()
 		{
 			@Override
-			public boolean execute(L2PcInstance member)
+			public Boolean execute(L2PcInstance member)
 			{
 				if ((member != null) && !BlockList.isBlocked(member, broadcaster))
 				{
@@ -177,7 +177,7 @@ public abstract class AbstractPlayerGroup
 	 *            If executing the procedure on a member returns {@code true}, the loop continues to the next member, otherwise it breaks the loop
 	 * @return {@code true} if the procedure executed correctly, {@code false} if the loop was broken prematurely
 	 */
-	public boolean forEachMember(IL2Procedure<L2PcInstance> procedure)
+	public boolean forEachMember(IProcedure<L2PcInstance, Boolean> procedure)
 	{
 		for (L2PcInstance player : getMembers())
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/CharEffectList.java

@@ -38,7 +38,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.EffectFlag;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager;
 import com.l2jserver.gameserver.model.olympiad.OlympiadGameTask;
 import com.l2jserver.gameserver.model.skills.AbnormalType;
@@ -1288,7 +1288,7 @@ public final class CharEffectList
 	 * @param dances if {@code true} dances/songs will be included
 	 * @return {@code true} if the procedure is executed successfully for every element, {@code false} otherwise
 	 */
-	public boolean forEach(IL2Procedure<BuffInfo> procedure, boolean dances)
+	public boolean forEach(IProcedure<BuffInfo, Boolean> procedure, boolean dances)
 	{
 		if (hasBuffs())
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2CommandChannel.java

@@ -25,7 +25,7 @@ import javolution.util.FastList;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.actor.L2Character;
 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.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExCloseMPCC;
 import com.l2jserver.gameserver.network.serverpackets.ExMPCCPartyInfoUpdate;
@@ -236,10 +236,10 @@ public class L2CommandChannel extends AbstractPlayerGroup
 	
 	/**
 	 * Iterates over all command channel members without the need to allocate a new list
-	 * @see com.l2jserver.gameserver.model.AbstractPlayerGroup#forEachMember(IL2Procedure)
+	 * @see com.l2jserver.gameserver.model.AbstractPlayerGroup#forEachMember(IProcedure)
 	 */
 	@Override
-	public boolean forEachMember(IL2Procedure<L2PcInstance> procedure)
+	public boolean forEachMember(IProcedure<L2PcInstance, Boolean> procedure)
 	{
 		if ((_parties != null) && !_parties.isEmpty())
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2World.java

@@ -34,7 +34,7 @@ import com.l2jserver.gameserver.datatables.CharNameTable;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 import com.l2jserver.util.StringUtil;
 
 public final class L2World
@@ -192,7 +192,7 @@ public final class L2World
 		return players;
 	}
 	
-	public boolean forEachPlayer(IL2Procedure<L2PcInstance> procedure)
+	public boolean forEachPlayer(IProcedure<L2PcInstance, Boolean> procedure)
 	{
 		for (L2PcInstance player : _allPlayers.values())
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java

@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.instancemanager.FourSepulchersManager;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.network.NpcStringId;
@@ -440,7 +440,7 @@ public class L2SepulcherNpcInstance extends L2Npc
 		L2World.getInstance().forEachPlayer(new SayInShout(this, new CreatureSay(0, Say2.NPC_SHOUT, getName(), msg)));
 	}
 	
-	private final class SayInShout implements IL2Procedure<L2PcInstance>
+	private final class SayInShout implements IProcedure<L2PcInstance, Boolean>
 	{
 		L2SepulcherNpcInstance _npc;
 		CreatureSay _sm;
@@ -452,7 +452,7 @@ public class L2SepulcherNpcInstance extends L2Npc
 		}
 		
 		@Override
-		public final boolean execute(final L2PcInstance player)
+		public final Boolean execute(final L2PcInstance player)
 		{
 			if (player != null)
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Fort.java

@@ -56,7 +56,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.zone.type.L2FortZone;
 import com.l2jserver.gameserver.model.zone.type.L2SiegeZone;
@@ -1361,7 +1361,7 @@ public final class Fort extends AbstractResidence
 		}
 	}
 	
-	private final class ForEachPlayerSendMessage implements IL2Procedure<L2PcInstance>
+	private final class ForEachPlayerSendMessage implements IProcedure<L2PcInstance, Boolean>
 	{
 		SystemMessage _sm;
 		
@@ -1371,7 +1371,7 @@ public final class Fort extends AbstractResidence
 		}
 		
 		@Override
-		public final boolean execute(final L2PcInstance character)
+		public final Boolean execute(final L2PcInstance character)
 		{
 			character.sendPacket(_sm);
 			return true;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Instance.java

@@ -58,7 +58,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2DoorTemplate;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 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.network.SystemMessageId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
@@ -826,10 +826,10 @@ public final class Instance
 		}
 	}
 	
-	public final class EjectProcedure implements IL2Procedure<Integer>
+	public final class EjectProcedure implements IProcedure<Integer, Boolean>
 	{
 		@Override
-		public boolean execute(Integer objectId)
+		public Boolean execute(Integer objectId)
 		{
 			final L2PcInstance player = L2World.getInstance().getPlayer(objectId);
 			if ((player != null) && (player.getInstanceId() == getId()))
@@ -848,7 +848,7 @@ public final class Instance
 		}
 	}
 	
-	public final class BroadcastPacket implements IL2Procedure<Integer>
+	public final class BroadcastPacket implements IProcedure<Integer, Boolean>
 	{
 		private final L2GameServerPacket _packet;
 		
@@ -858,7 +858,7 @@ public final class Instance
 		}
 		
 		@Override
-		public boolean execute(Integer objectId)
+		public Boolean execute(Integer objectId)
 		{
 			final L2PcInstance player = L2World.getInstance().getPlayer(objectId);
 			if ((player != null) && (player.getInstanceId() == getId()))

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/L2Event.java

@@ -46,7 +46,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.holders.PlayerEventHolder;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 import com.l2jserver.gameserver.network.serverpackets.CharInfo;
 import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
@@ -209,10 +209,10 @@ public class L2Event
 	 */
 	public static void unspawnEventNpcs()
 	{
-		SpawnTable.getInstance().forEachSpawn(new IL2Procedure<L2Spawn>()
+		SpawnTable.getInstance().forEachSpawn(new IProcedure<L2Spawn, Boolean>()
 		{
 			@Override
-			public boolean execute(L2Spawn spawn)
+			public Boolean execute(L2Spawn spawn)
 			{
 				L2Npc npc = spawn.getLastSpawn();
 				if ((npc != null) && npc.isEventMob())

L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IL2Procedure.java → L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IProcedure.java

@@ -22,13 +22,14 @@ package com.l2jserver.gameserver.model.interfaces;
  * Interface for procedures with one Object parameter.
  * @author Battlecruiser
  * @param <T> the type of object on which the procedure will be executed
+ * @param <R> the return type
  */
-public interface IL2Procedure<T>
+public interface IProcedure<T, R>
 {
 	/**
 	 * Executes this procedure. A false return value indicates that the application executing this procedure should not invoke this procedure again.
 	 * @param arg the object on which the procedure will be executed
 	 * @return {@code true} if additional invocations of the procedure are allowed.
 	 */
-	public boolean execute(T arg);
-}
+	public R execute(T arg);
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/Quest.java

@@ -66,8 +66,8 @@ import com.l2jserver.gameserver.model.base.AcquireSkillType;
 import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
 import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
 import com.l2jserver.gameserver.model.interfaces.IPositionable;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
@@ -3717,10 +3717,10 @@ public class Quest extends ManagedScript implements IIdentifiable
 		{
 			if (includeCommandChannel && player.getParty().isInCommandChannel())
 			{
-				player.getParty().getCommandChannel().forEachMember(new IL2Procedure<L2PcInstance>()
+				player.getParty().getCommandChannel().forEachMember(new IProcedure<L2PcInstance, Boolean>()
 				{
 					@Override
-					public boolean execute(L2PcInstance member)
+					public Boolean execute(L2PcInstance member)
 					{
 						actionForEachPlayer(member, npc, isSummon);
 						return true;
@@ -3729,10 +3729,10 @@ public class Quest extends ManagedScript implements IIdentifiable
 			}
 			else if (includeParty)
 			{
-				player.getParty().forEachMember(new IL2Procedure<L2PcInstance>()
+				player.getParty().forEachMember(new IProcedure<L2PcInstance, Boolean>()
 				{
 					@Override
-					public boolean execute(L2PcInstance member)
+					public Boolean execute(L2PcInstance member)
 					{
 						actionForEachPlayer(member, npc, isSummon);
 						return true;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestStartPledgeWar.java

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2World;
 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.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -145,7 +145,7 @@ public final class RequestStartPledgeWar extends L2GameClientPacket
 		L2World.getInstance().forEachPlayer(new ForEachPlayerBroadcastUserInfo(player, clan));
 	}
 	
-	private final class ForEachPlayerBroadcastUserInfo implements IL2Procedure<L2PcInstance>
+	private final class ForEachPlayerBroadcastUserInfo implements IProcedure<L2PcInstance, Boolean>
 	{
 		private final L2Clan _cln;
 		private final L2PcInstance _ply;
@@ -157,7 +157,7 @@ public final class RequestStartPledgeWar extends L2GameClientPacket
 		}
 		
 		@Override
-		public final boolean execute(final L2PcInstance cha)
+		public final Boolean execute(final L2PcInstance cha)
 		{
 			if ((cha.getClan() == _ply.getClan()) || (cha.getClan() == _cln))
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestStopPledgeWar.java

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2ClanMember;
 import com.l2jserver.gameserver.model.L2World;
 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.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
@@ -113,7 +113,7 @@ public final class RequestStopPledgeWar extends L2GameClientPacket
 		L2World.getInstance().forEachPlayer(new ForEachPlayerBroadcastUserInfo(clan, player));
 	}
 	
-	private final class ForEachPlayerBroadcastUserInfo implements IL2Procedure<L2PcInstance>
+	private final class ForEachPlayerBroadcastUserInfo implements IProcedure<L2PcInstance, Boolean>
 	{
 		private final L2PcInstance _player;
 		private final L2Clan _cln;
@@ -125,7 +125,7 @@ public final class RequestStopPledgeWar extends L2GameClientPacket
 		}
 		
 		@Override
-		public final boolean execute(final L2PcInstance cha)
+		public final Boolean execute(final L2PcInstance cha)
 		{
 			if ((cha.getClan() == _player.getClan()) || (cha.getClan() == _cln))
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/util/Broadcast.java

@@ -25,7 +25,7 @@ import java.util.logging.Logger;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Character;
 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.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.CharInfo;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
@@ -208,7 +208,7 @@ public final class Broadcast
 		L2World.getInstance().forEachPlayer(new ForEachPlayerInInstanceBroadcast(mov, instanceId));
 	}
 	
-	private static final class ForEachPlayerBroadcast implements IL2Procedure<L2PcInstance>
+	private static final class ForEachPlayerBroadcast implements IProcedure<L2PcInstance, Boolean>
 	{
 		L2GameServerPacket _packet;
 		
@@ -218,7 +218,7 @@ public final class Broadcast
 		}
 		
 		@Override
-		public final boolean execute(final L2PcInstance onlinePlayer)
+		public final Boolean execute(final L2PcInstance onlinePlayer)
 		{
 			if ((onlinePlayer != null) && onlinePlayer.isOnline())
 			{
@@ -228,7 +228,7 @@ public final class Broadcast
 		}
 	}
 	
-	private static final class ForEachPlayerInInstanceBroadcast implements IL2Procedure<L2PcInstance>
+	private static final class ForEachPlayerInInstanceBroadcast implements IProcedure<L2PcInstance, Boolean>
 	{
 		private final L2GameServerPacket _packet;
 		private final int _instanceId;
@@ -240,7 +240,7 @@ public final class Broadcast
 		}
 		
 		@Override
-		public final boolean execute(final L2PcInstance onlinePlayer)
+		public final Boolean execute(final L2PcInstance onlinePlayer)
 		{
 			if ((onlinePlayer != null) && onlinePlayer.isOnline() && (onlinePlayer.getInstanceId() == _instanceId))
 			{

L2J_Server_BETA/java/com/l2jserver/util/L2ArrayList.java

@@ -21,7 +21,7 @@ package com.l2jserver.util;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 
 /**
  * A custom version of ArrayList: Extension for iterating without using temporary collection<br>
@@ -56,7 +56,7 @@ public class L2ArrayList<T> extends ArrayList<T>
 	 * @return - returns true if entire collection is iterated, false if it`s been interrupted by<br>
 	 *         check method (IL2Procedure.execute(T))<br>
 	 */
-	public boolean executeForEach(IL2Procedure<T> proc)
+	public boolean executeForEach(IProcedure<T, Boolean> proc)
 	{
 		for (T e : this)
 		{

L2J_Server_BETA/java/com/l2jserver/util/L2FastList.java

@@ -22,7 +22,7 @@ import java.util.Collection;
 
 import javolution.util.FastList;
 
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 
 /**
  * A custom version of FastList with extension for iterating without using temporary collection<br>
@@ -90,7 +90,7 @@ public class L2FastList<T> extends FastList<T>
 	 * @return - returns true if entire collection is iterated, false if it`s been interrupted by<br>
 	 *         check method (IL2Procedure.execute(T))<br>
 	 */
-	public boolean executeForEach(IL2Procedure<T> proc)
+	public boolean executeForEach(IProcedure<T, Boolean> proc)
 	{
 		for (T e : this)
 		{

L2J_Server_BETA/java/com/l2jserver/util/L2FastMap.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import javolution.util.FastMap;
 
 import com.l2jserver.gameserver.model.interfaces.IL2EntryProcedure;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 
 /**
  * A custom version of FastMap with extension for iterating without using temporary collection<br>
@@ -104,7 +104,7 @@ public class L2FastMap<K, V> extends FastMap<K, V>
 		return true;
 	}
 	
-	public boolean executeForEachKey(IL2Procedure<K> proc)
+	public boolean executeForEachKey(IProcedure<K, Boolean> proc)
 	{
 		for (K k : keySet())
 		{
@@ -116,7 +116,7 @@ public class L2FastMap<K, V> extends FastMap<K, V>
 		return true;
 	}
 	
-	public boolean executeForEachValue(IL2Procedure<V> proc)
+	public boolean executeForEachValue(IProcedure<V, Boolean> proc)
 	{
 		for (V v : values())
 		{

L2J_Server_BETA/java/com/l2jserver/util/L2HashMap.java

@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.l2jserver.gameserver.model.interfaces.IL2EntryProcedure;
-import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IProcedure;
 
 /**
  * A custom version of HashMap: Extension for iterating without using temporary collection<br>
@@ -76,7 +76,7 @@ public class L2HashMap<K, V> extends HashMap<K, V>
 		return true;
 	}
 	
-	public boolean executeForEachKey(IL2Procedure<K> proc)
+	public boolean executeForEachKey(IProcedure<K, Boolean> proc)
 	{
 		for (K k : keySet())
 		{
@@ -88,7 +88,7 @@ public class L2HashMap<K, V> extends HashMap<K, V>
 		return true;
 	}
 	
-	public boolean executeForEachValue(IL2Procedure<V> proc)
+	public boolean executeForEachValue(IProcedure<V, Boolean> proc)
 	{
 		for (V v : values())
 		{