From 006bfa9e8b6a1e2baea25a0ffe73051079f5e996 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 16 Jun 2022 21:05:57 +0000
Subject: [PATCH] Proper trigger for OnItemUse event.

---
 .../l2jmobius/gameserver/network/clientpackets/UseItem.java | 6 +++---
 .../l2jmobius/gameserver/network/clientpackets/UseItem.java | 6 +++---
 .../l2jmobius/gameserver/network/clientpackets/UseItem.java | 6 +++---
 .../l2jmobius/gameserver/network/clientpackets/UseItem.java | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 14ddf2527b..14b799a6c6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -296,9 +296,6 @@ public class UseItem implements IClientIncomingPacket
 				{
 					PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!");
 				}
-				
-				// Notify events.
-				EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
 			}
 			else if (handler.useItem(player, item, _ctrlPressed))
 			{
@@ -309,6 +306,9 @@ public class UseItem implements IClientIncomingPacket
 					player.addTimeStampItem(item, reuseDelay);
 					sendSharedGroupUpdate(player, sharedReuseGroup, reuseDelay, reuseDelay);
 				}
+				
+				// Notify events.
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
 			}
 			
 			if ((etcItem != null) && etcItem.isMineral())
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 9ee9a21e77..59fb972162 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -286,9 +286,6 @@ public class UseItem implements IClientIncomingPacket
 					player.sendPacket(sm);
 					return;
 				}
-				
-				// Notify events.
-				EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
 			}
 			if (player.isCastingNow())
 			{
@@ -325,6 +322,9 @@ public class UseItem implements IClientIncomingPacket
 					player.addTimeStampItem(item, reuseDelay);
 					sendSharedGroupUpdate(player, sharedReuseGroup, reuseDelay, reuseDelay);
 				}
+				
+				// Notify events.
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
 			}
 			
 			if ((etcItem != null) && etcItem.isMineral())
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 9ee9a21e77..59fb972162 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -286,9 +286,6 @@ public class UseItem implements IClientIncomingPacket
 					player.sendPacket(sm);
 					return;
 				}
-				
-				// Notify events.
-				EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
 			}
 			if (player.isCastingNow())
 			{
@@ -325,6 +322,9 @@ public class UseItem implements IClientIncomingPacket
 					player.addTimeStampItem(item, reuseDelay);
 					sendSharedGroupUpdate(player, sharedReuseGroup, reuseDelay, reuseDelay);
 				}
+				
+				// Notify events.
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
 			}
 			
 			if ((etcItem != null) && etcItem.isMineral())
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 118f10d3dc..f294a77f0d 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -287,9 +287,6 @@ public class UseItem implements IClientIncomingPacket
 					player.sendPacket(sm);
 					return;
 				}
-				
-				// Notify events.
-				EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
 			}
 			if (player.isCastingNow())
 			{
@@ -326,6 +323,9 @@ public class UseItem implements IClientIncomingPacket
 					player.addTimeStampItem(item, reuseDelay);
 					sendSharedGroupUpdate(player, sharedReuseGroup, reuseDelay, reuseDelay);
 				}
+				
+				// Notify events.
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
 			}
 			
 			if (etcItem != null)