From c1667717531149b64d45fa35a77eae1ab9f19478 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 8 Dec 2021 00:30:40 +0000
Subject: [PATCH] Removed unnecessary methods from IClientOutgoingPacket.

---
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../CeremonyOfChaos/CeremonyOfChaos.java      |  6 ++---
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../CeremonyOfChaos/CeremonyOfChaos.java      |  6 ++---
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../CeremonyOfChaos/CeremonyOfChaos.java      |  6 ++---
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../CeremonyOfChaos/CeremonyOfChaos.java      |  6 ++---
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../CeremonyOfChaos/CeremonyOfChaos.java      |  6 ++---
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../CeremonyOfChaos/CeremonyOfChaos.java      |  6 ++---
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../CeremonyOfChaos/CeremonyOfChaos.java      |  6 ++---
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../CeremonyOfChaos/CeremonyOfChaos.java      |  6 ++---
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../CeremonyOfChaos/CeremonyOfChaos.java      |  6 ++---
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../CeremonyOfChaos/CeremonyOfChaos.java      |  6 ++---
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../CeremonyOfChaos/CeremonyOfChaos.java      |  6 ++---
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../clientpackets/IClientIncomingPacket.java  |  2 +-
 .../serverpackets/IClientOutgoingPacket.java  | 24 -------------------
 .../clientpackets/IClientIncomingPacket.java  |  2 +-
 .../serverpackets/IClientOutgoingPacket.java  | 24 -------------------
 .../serverpackets/IClientOutgoingPacket.java  | 24 -------------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../serverpackets/IClientOutgoingPacket.java  | 24 -------------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 .../admincommandhandlers/AdminAdmin.java      |  2 +-
 .../handlers/chathandlers/ChatWorld.java      |  6 ++---
 .../effecthandlers/AbnormalTimeChange.java    |  2 +-
 .../gameserver/model/EffectList.java          |  2 +-
 .../matching/CommandChannelMatchingRoom.java  |  2 +-
 .../model/matching/PartyMatchingRoom.java     |  2 +-
 .../gameserver/model/siege/Siege.java         | 10 ++++++--
 .../clientpackets/RequestPartyMatchList.java  |  5 +++-
 .../serverpackets/IClientOutgoingPacket.java  | 21 ----------------
 .../l2jmobius/gameserver/util/Broadcast.java  | 12 +++++-----
 229 files changed, 593 insertions(+), 941 deletions(-)

diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 28fe69a5b6..8cd63a3b47 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index 0f25026158..0b4461c64f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -544,7 +544,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 					{
 						if (member.getObjectId() != player.getObjectId())
 						{
-							deleteObject.sendTo(member);
+							member.sendPacket(deleteObject);
 						}
 					}
 					
@@ -1006,7 +1006,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 				{
 					if (member.getObjectId() != targetPlayer.getObjectId())
 					{
-						deleteObject.sendTo(member);
+						member.sendPacket(deleteObject);
 					}
 				}
 				
@@ -1113,7 +1113,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	{
 		for (Player player : PARTICIPANT_PLAYERS)
 		{
-			packet.sendTo(player);
+			player.sendPacket(packet);
 		}
 	}
 	
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java
index c43bdd472b..0f50e8365e 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index ec7d3402bf..b27eecaefa 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -103,26 +102,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 28fe69a5b6..8cd63a3b47 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index d7b9de9c31..f6269c9fbe 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -544,7 +544,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 					{
 						if (member.getObjectId() != player.getObjectId())
 						{
-							deleteObject.sendTo(member);
+							member.sendPacket(deleteObject);
 						}
 					}
 					
@@ -1006,7 +1006,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 				{
 					if (member.getObjectId() != targetPlayer.getObjectId())
 					{
-						deleteObject.sendTo(member);
+						member.sendPacket(deleteObject);
 					}
 				}
 				
@@ -1113,7 +1113,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	{
 		for (Player player : PARTICIPANT_PLAYERS)
 		{
-			packet.sendTo(player);
+			player.sendPacket(packet);
 		}
 	}
 	
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java
index c27fafca72..db2f7c5e89 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index ec7d3402bf..b27eecaefa 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -103,26 +102,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 06f13b528e..0b11246249 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index d7b9de9c31..f6269c9fbe 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -544,7 +544,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 					{
 						if (member.getObjectId() != player.getObjectId())
 						{
-							deleteObject.sendTo(member);
+							member.sendPacket(deleteObject);
 						}
 					}
 					
@@ -1006,7 +1006,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 				{
 					if (member.getObjectId() != targetPlayer.getObjectId())
 					{
-						deleteObject.sendTo(member);
+						member.sendPacket(deleteObject);
 					}
 				}
 				
@@ -1113,7 +1113,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	{
 		for (Player player : PARTICIPANT_PLAYERS)
 		{
-			packet.sendTo(player);
+			player.sendPacket(packet);
 		}
 	}
 	
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java
index c27fafca72..db2f7c5e89 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index ec7d3402bf..b27eecaefa 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -103,26 +102,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 06f13b528e..0b11246249 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index d7b9de9c31..f6269c9fbe 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -544,7 +544,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 					{
 						if (member.getObjectId() != player.getObjectId())
 						{
-							deleteObject.sendTo(member);
+							member.sendPacket(deleteObject);
 						}
 					}
 					
@@ -1006,7 +1006,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 				{
 					if (member.getObjectId() != targetPlayer.getObjectId())
 					{
-						deleteObject.sendTo(member);
+						member.sendPacket(deleteObject);
 					}
 				}
 				
@@ -1113,7 +1113,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	{
 		for (Player player : PARTICIPANT_PLAYERS)
 		{
-			packet.sendTo(player);
+			player.sendPacket(packet);
 		}
 	}
 	
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java
index c27fafca72..db2f7c5e89 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index ec7d3402bf..b27eecaefa 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -103,26 +102,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 17ba7d0197..7d881ad3f8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index 6ea0ce47c8..3840d38bf5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -544,7 +544,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 					{
 						if (member.getObjectId() != player.getObjectId())
 						{
-							deleteObject.sendTo(member);
+							member.sendPacket(deleteObject);
 						}
 					}
 					
@@ -1006,7 +1006,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 				{
 					if (member.getObjectId() != targetPlayer.getObjectId())
 					{
-						deleteObject.sendTo(member);
+						member.sendPacket(deleteObject);
 					}
 				}
 				
@@ -1113,7 +1113,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	{
 		for (Player player : PARTICIPANT_PLAYERS)
 		{
-			packet.sendTo(player);
+			player.sendPacket(packet);
 		}
 	}
 	
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Siege.java
index abaac6eab8..0ff2c8f781 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 9898743327..bff97454e1 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -108,26 +107,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index c92ed6406e..aea3440eba 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index e589314df9..d9bfe95aef 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -544,7 +544,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 					{
 						if (member.getObjectId() != player.getObjectId())
 						{
-							deleteObject.sendTo(member);
+							member.sendPacket(deleteObject);
 						}
 					}
 					
@@ -1006,7 +1006,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 				{
 					if (member.getObjectId() != targetPlayer.getObjectId())
 					{
-						deleteObject.sendTo(member);
+						member.sendPacket(deleteObject);
 					}
 				}
 				
@@ -1113,7 +1113,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	{
 		for (Player player : PARTICIPANT_PLAYERS)
 		{
-			packet.sendTo(player);
+			player.sendPacket(packet);
 		}
 	}
 	
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Siege.java
index 185889a699..853b3fcdc9 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 105cf38f50..d588f1c7cf 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -130,26 +129,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index c92ed6406e..aea3440eba 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index e589314df9..d9bfe95aef 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -544,7 +544,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 					{
 						if (member.getObjectId() != player.getObjectId())
 						{
-							deleteObject.sendTo(member);
+							member.sendPacket(deleteObject);
 						}
 					}
 					
@@ -1006,7 +1006,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 				{
 					if (member.getObjectId() != targetPlayer.getObjectId())
 					{
-						deleteObject.sendTo(member);
+						member.sendPacket(deleteObject);
 					}
 				}
 				
@@ -1113,7 +1113,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	{
 		for (Player player : PARTICIPANT_PLAYERS)
 		{
-			packet.sendTo(player);
+			player.sendPacket(packet);
 		}
 	}
 	
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Siege.java
index 185889a699..853b3fcdc9 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 105cf38f50..d588f1c7cf 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -130,26 +129,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 06f13b528e..0b11246249 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index 97daa64940..efffe12bbc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -544,7 +544,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 					{
 						if (member.getObjectId() != player.getObjectId())
 						{
-							deleteObject.sendTo(member);
+							member.sendPacket(deleteObject);
 						}
 					}
 					
@@ -1006,7 +1006,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 				{
 					if (member.getObjectId() != targetPlayer.getObjectId())
 					{
-						deleteObject.sendTo(member);
+						member.sendPacket(deleteObject);
 					}
 				}
 				
@@ -1118,7 +1118,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	{
 		for (Player player : PARTICIPANT_PLAYERS)
 		{
-			packet.sendTo(player);
+			player.sendPacket(packet);
 		}
 	}
 	
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Siege.java
index 7c5a27e6a4..65ea413f74 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -542,7 +542,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -553,7 +556,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 105cf38f50..d588f1c7cf 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -130,26 +129,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 06f13b528e..0b11246249 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index 97daa64940..efffe12bbc 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -544,7 +544,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 					{
 						if (member.getObjectId() != player.getObjectId())
 						{
-							deleteObject.sendTo(member);
+							member.sendPacket(deleteObject);
 						}
 					}
 					
@@ -1006,7 +1006,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 				{
 					if (member.getObjectId() != targetPlayer.getObjectId())
 					{
-						deleteObject.sendTo(member);
+						member.sendPacket(deleteObject);
 					}
 				}
 				
@@ -1118,7 +1118,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	{
 		for (Player player : PARTICIPANT_PLAYERS)
 		{
-			packet.sendTo(player);
+			player.sendPacket(packet);
 		}
 	}
 	
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Siege.java
index 9aadaadd1f..b7afd161f3 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 105cf38f50..d588f1c7cf 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -130,26 +129,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Broadcast.java
index aa640f6995..8d80549351 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 06f13b528e..0b11246249 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index 97daa64940..efffe12bbc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -544,7 +544,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 					{
 						if (member.getObjectId() != player.getObjectId())
 						{
-							deleteObject.sendTo(member);
+							member.sendPacket(deleteObject);
 						}
 					}
 					
@@ -1006,7 +1006,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 				{
 					if (member.getObjectId() != targetPlayer.getObjectId())
 					{
-						deleteObject.sendTo(member);
+						member.sendPacket(deleteObject);
 					}
 				}
 				
@@ -1118,7 +1118,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	{
 		for (Player player : PARTICIPANT_PLAYERS)
 		{
-			packet.sendTo(player);
+			player.sendPacket(packet);
 		}
 	}
 	
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/EffectList.java
index 5a46c1633a..701b5fc2bf 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Siege.java
index 9aadaadd1f..b7afd161f3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 105cf38f50..d588f1c7cf 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -130,26 +129,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Broadcast.java
index aa640f6995..8d80549351 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 06f13b528e..0b11246249 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index 97daa64940..efffe12bbc 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -544,7 +544,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 					{
 						if (member.getObjectId() != player.getObjectId())
 						{
-							deleteObject.sendTo(member);
+							member.sendPacket(deleteObject);
 						}
 					}
 					
@@ -1006,7 +1006,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 				{
 					if (member.getObjectId() != targetPlayer.getObjectId())
 					{
-						deleteObject.sendTo(member);
+						member.sendPacket(deleteObject);
 					}
 				}
 				
@@ -1118,7 +1118,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	{
 		for (Player player : PARTICIPANT_PLAYERS)
 		{
-			packet.sendTo(player);
+			player.sendPacket(packet);
 		}
 	}
 	
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/EffectList.java
index 5a46c1633a..701b5fc2bf 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java
index 9aadaadd1f..b7afd161f3 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 105cf38f50..d588f1c7cf 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -130,26 +129,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/Broadcast.java
index aa640f6995..8d80549351 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
index 2d588afffd..eddff9f891 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
@@ -22,7 +22,7 @@ import org.l2jmobius.commons.network.IIncomingPacket;
 import org.l2jmobius.gameserver.network.GameClient;
 
 /**
- * Packets received by the game serv@Override er from clients
+ * Packets received by the game server from clients
  * @author KenM
  */
 public interface IClientIncomingPacket extends IIncomingPacket<GameClient>
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 5ca388ad1e..982959201e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.network.IOutgoingPacket;
-import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
 
 /**
@@ -29,30 +28,7 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 {
 	Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName());
 	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
-	
-	default void writeOptionalD(PacketWriter packet, int value)
-	{
-		if (value >= Short.MAX_VALUE)
-		{
-			packet.writeH(Short.MAX_VALUE);
-			packet.writeD(value);
-		}
-		else
-		{
-			packet.writeH(value);
-		}
-	}
 }
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
index 2d588afffd..eddff9f891 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
@@ -22,7 +22,7 @@ import org.l2jmobius.commons.network.IIncomingPacket;
 import org.l2jmobius.gameserver.network.GameClient;
 
 /**
- * Packets received by the game serv@Override er from clients
+ * Packets received by the game server from clients
  * @author KenM
  */
 public interface IClientIncomingPacket extends IIncomingPacket<GameClient>
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 5ca388ad1e..982959201e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.network.IOutgoingPacket;
-import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
 
 /**
@@ -29,30 +28,7 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 {
 	Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName());
 	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
-	
-	default void writeOptionalD(PacketWriter packet, int value)
-	{
-		if (value >= Short.MAX_VALUE)
-		{
-			packet.writeH(Short.MAX_VALUE);
-			packet.writeD(value);
-		}
-		else
-		{
-			packet.writeH(value);
-		}
-	}
 }
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 3ae43b18cb..63f368277f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.network.IOutgoingPacket;
-import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
@@ -65,30 +64,7 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER;
 	}
 	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
-	
-	default void writeOptionalD(PacketWriter packet, int value)
-	{
-		if (value >= Short.MAX_VALUE)
-		{
-			packet.writeH(Short.MAX_VALUE);
-			packet.writeD(value);
-		}
-		else
-		{
-			packet.writeH(value);
-		}
-	}
 }
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Broadcast.java
index 7f34205957..3507f3739e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -111,10 +111,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -122,7 +122,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -146,7 +146,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -156,10 +156,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 3ae43b18cb..63f368277f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.network.IOutgoingPacket;
-import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
@@ -65,30 +64,7 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER;
 	}
 	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
-	
-	default void writeOptionalD(PacketWriter packet, int value)
-	{
-		if (value >= Short.MAX_VALUE)
-		{
-			packet.writeH(Short.MAX_VALUE);
-			packet.writeD(value);
-		}
-		else
-		{
-			packet.writeH(value);
-		}
-	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java
index 7f34205957..3507f3739e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -111,10 +111,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -122,7 +122,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -146,7 +146,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -156,10 +156,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 28fe69a5b6..8cd63a3b47 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Siege.java
index e23071a8fe..50fce86ca9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index ec7d3402bf..b27eecaefa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -103,26 +102,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 28fe69a5b6..8cd63a3b47 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Siege.java
index e23071a8fe..50fce86ca9 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index ec7d3402bf..b27eecaefa 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -103,26 +102,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 28fe69a5b6..8cd63a3b47 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Siege.java
index e23071a8fe..50fce86ca9 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 9898743327..bff97454e1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -108,26 +107,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 28fe69a5b6..8cd63a3b47 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Siege.java
index e23071a8fe..50fce86ca9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 105cf38f50..d588f1c7cf 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -130,26 +129,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 28fe69a5b6..8cd63a3b47 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Siege.java
index e23071a8fe..50fce86ca9 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 105cf38f50..d588f1c7cf 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -130,26 +129,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 28fe69a5b6..8cd63a3b47 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Siege.java
index e23071a8fe..50fce86ca9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 105cf38f50..d588f1c7cf 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -130,26 +129,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index 28fe69a5b6..8cd63a3b47 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java
index c256926915..1818e4cce0 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index ec7d3402bf..b27eecaefa 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -103,26 +102,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java
index 1441a726b7..01e15e28a6 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index dcaf454e87..1530e324b1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/EffectList.java
index acff7e5344..4072fc495a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Siege.java
index d2f4069ebd..0cc11b61e0 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 105cf38f50..d588f1c7cf 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -130,26 +129,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Broadcast.java
index aa640f6995..8d80549351 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index dcaf454e87..1530e324b1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/EffectList.java
index 5a46c1633a..701b5fc2bf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Siege.java
index d2f4069ebd..0cc11b61e0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 105cf38f50..d588f1c7cf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -130,26 +129,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Broadcast.java
index aa640f6995..8d80549351 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index ee7a055335..ad80a78209 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -301,7 +301,7 @@ public class AdminAdmin implements IAdminCommandHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 					break;
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
index dcaf454e87..1530e324b1 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java
@@ -102,7 +102,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -112,7 +112,7 @@ public class ChatWorld implements IChatHandler
 					{
 						if (player.isNotBlocked(activeChar))
 						{
-							cs.sendTo(player);
+							player.sendPacket(cs);
 						}
 					}
 				}
@@ -123,7 +123,7 @@ public class ChatWorld implements IChatHandler
 				{
 					if (player.isNotBlocked(activeChar))
 					{
-						cs.sendTo(player);
+						player.sendPacket(cs);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
index cd778fb709..62e4b4f595 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java
@@ -150,7 +150,7 @@ public class AbnormalTimeChange extends AbstractEffect
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/EffectList.java
index 5a46c1633a..701b5fc2bf 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -1129,7 +1129,7 @@ public class EffectList
 		{
 			if ((creature != null) && creature.isPlayer())
 			{
-				upd.sendTo(creature.getActingPlayer());
+				creature.sendPacket(upd);
 			}
 		}
 		
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
index 589b517a77..1b1ba788b0 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/matching/CommandChannelMatchingRoom.java
@@ -72,7 +72,7 @@ public class CommandChannelMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
index d6fb03d869..e1a5ca4b7a 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/matching/PartyMatchingRoom.java
@@ -73,7 +73,7 @@ public class PartyMatchingRoom extends MatchingRoom
 		{
 			if (member != player)
 			{
-				sm.sendTo(member);
+				member.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Siege.java
index d2f4069ebd..0cc11b61e0 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Siege.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Siege.java
@@ -539,7 +539,10 @@ public class Siege implements Siegable
 			final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 			if (clan != null)
 			{
-				clan.getOnlineMembers(0).forEach(message::sendTo);
+				for (Player member : clan.getOnlineMembers(0))
+				{
+					member.sendPacket(message);
+				}
 			}
 		}
 		
@@ -550,7 +553,10 @@ public class Siege implements Siegable
 				final Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
 				if (clan != null)
 				{
-					clan.getOnlineMembers(0).forEach(message::sendTo);
+					for (Player member : clan.getOnlineMembers(0))
+					{
+						member.sendPacket(message);
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 8061716273..4d5e1fc2d0 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -74,7 +74,10 @@ public class RequestPartyMatchList implements IClientIncomingPacket
 				room.setTitle(_roomTitle);
 				
 				final PartyRoomInfo packet = new PartyRoomInfo((PartyMatchingRoom) room);
-				room.getMembers().forEach(packet::sendTo);
+				for (Player member : room.getMembers())
+				{
+					member.sendPacket(packet);
+				}
 			}
 		}
 	}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
index 105cf38f50..d588f1c7cf 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
 import org.l2jmobius.commons.network.IOutgoingPacket;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
@@ -130,26 +129,6 @@ public interface IClientOutgoingPacket extends IOutgoingPacket
 		return PAPERDOLL_ORDER_VISUAL_ID;
 	}
 	
-	/**
-	 * @param masks
-	 * @param type
-	 * @return {@code true} if the mask contains the current update component type
-	 */
-	static boolean containsMask(int masks, IUpdateTypeComponent type)
-	{
-		return (masks & type.getMask()) == type.getMask();
-	}
-	
-	/**
-	 * Sends this packet to the target player, useful for lambda operations like<br>
-	 * {@code World.getInstance().getPlayers().forEach(packet::sendTo)}
-	 * @param player
-	 */
-	default void sendTo(Player player)
-	{
-		player.sendPacket(this);
-	}
-	
 	default void runImpl(Player player)
 	{
 	}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/Broadcast.java
index aa640f6995..8d80549351 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -122,10 +122,10 @@ public class Broadcast
 	 * In order to inform other players of state modification on the Creature, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
-	 * @param mov
+	 * @param packet
 	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -133,7 +133,7 @@ public class Broadcast
 			radius = 1500;
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**
@@ -157,7 +157,7 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket packet, int radiusValue)
 	{
 		int radius = radiusValue;
 		if (radius < 0)
@@ -167,10 +167,10 @@ public class Broadcast
 		
 		if (creature.isPlayer())
 		{
-			creature.sendPacket(mov);
+			creature.sendPacket(packet);
 		}
 		
-		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, mov::sendTo);
+		World.getInstance().forEachVisibleObjectInRange(creature, Player.class, radius, player -> player.sendPacket(packet));
 	}
 	
 	/**