Proper trigger for OnItemUse event.
This commit is contained in:
parent
f186d811e2
commit
006bfa9e8b
@ -296,9 +296,6 @@ public class UseItem implements IClientIncomingPacket
|
|||||||
{
|
{
|
||||||
PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!");
|
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))
|
else if (handler.useItem(player, item, _ctrlPressed))
|
||||||
{
|
{
|
||||||
@ -309,6 +306,9 @@ public class UseItem implements IClientIncomingPacket
|
|||||||
player.addTimeStampItem(item, reuseDelay);
|
player.addTimeStampItem(item, reuseDelay);
|
||||||
sendSharedGroupUpdate(player, sharedReuseGroup, reuseDelay, reuseDelay);
|
sendSharedGroupUpdate(player, sharedReuseGroup, reuseDelay, reuseDelay);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Notify events.
|
||||||
|
EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((etcItem != null) && etcItem.isMineral())
|
if ((etcItem != null) && etcItem.isMineral())
|
||||||
|
@ -286,9 +286,6 @@ public class UseItem implements IClientIncomingPacket
|
|||||||
player.sendPacket(sm);
|
player.sendPacket(sm);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Notify events.
|
|
||||||
EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
|
|
||||||
}
|
}
|
||||||
if (player.isCastingNow())
|
if (player.isCastingNow())
|
||||||
{
|
{
|
||||||
@ -325,6 +322,9 @@ public class UseItem implements IClientIncomingPacket
|
|||||||
player.addTimeStampItem(item, reuseDelay);
|
player.addTimeStampItem(item, reuseDelay);
|
||||||
sendSharedGroupUpdate(player, sharedReuseGroup, reuseDelay, reuseDelay);
|
sendSharedGroupUpdate(player, sharedReuseGroup, reuseDelay, reuseDelay);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Notify events.
|
||||||
|
EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((etcItem != null) && etcItem.isMineral())
|
if ((etcItem != null) && etcItem.isMineral())
|
||||||
|
@ -286,9 +286,6 @@ public class UseItem implements IClientIncomingPacket
|
|||||||
player.sendPacket(sm);
|
player.sendPacket(sm);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Notify events.
|
|
||||||
EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
|
|
||||||
}
|
}
|
||||||
if (player.isCastingNow())
|
if (player.isCastingNow())
|
||||||
{
|
{
|
||||||
@ -325,6 +322,9 @@ public class UseItem implements IClientIncomingPacket
|
|||||||
player.addTimeStampItem(item, reuseDelay);
|
player.addTimeStampItem(item, reuseDelay);
|
||||||
sendSharedGroupUpdate(player, sharedReuseGroup, reuseDelay, reuseDelay);
|
sendSharedGroupUpdate(player, sharedReuseGroup, reuseDelay, reuseDelay);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Notify events.
|
||||||
|
EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((etcItem != null) && etcItem.isMineral())
|
if ((etcItem != null) && etcItem.isMineral())
|
||||||
|
@ -287,9 +287,6 @@ public class UseItem implements IClientIncomingPacket
|
|||||||
player.sendPacket(sm);
|
player.sendPacket(sm);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Notify events.
|
|
||||||
EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
|
|
||||||
}
|
}
|
||||||
if (player.isCastingNow())
|
if (player.isCastingNow())
|
||||||
{
|
{
|
||||||
@ -326,6 +323,9 @@ public class UseItem implements IClientIncomingPacket
|
|||||||
player.addTimeStampItem(item, reuseDelay);
|
player.addTimeStampItem(item, reuseDelay);
|
||||||
sendSharedGroupUpdate(player, sharedReuseGroup, reuseDelay, reuseDelay);
|
sendSharedGroupUpdate(player, sharedReuseGroup, reuseDelay, reuseDelay);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Notify events.
|
||||||
|
EventDispatcher.getInstance().notifyEventAsync(new OnItemUse(player, item), item.getTemplate());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (etcItem != null)
|
if (etcItem != null)
|
||||||
|
Loading…
Reference in New Issue
Block a user