From 5413c9f399568a2185833cda1ca18fcd341378a0 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 24 Aug 2019 12:13:13 +0000 Subject: [PATCH] Fixed Henna removal. --- .../admincommandhandlers/AdminCreateItem.java | 2 +- .../model/actor/instance/PlayerInstance.java | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java index 5e4d63b468..121b07c956 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java @@ -220,7 +220,7 @@ public class AdminCreateItem implements IAdminCommandHandler { if (activeChar.getTarget() instanceof PlayerInstance) { - if ((activeChar.getAccessLevel().getLevel() > 0) && (activeChar.getAccessLevel().getLevel() > 70)) + if (activeChar.getAccessLevel().getLevel() > 70) { Player = (PlayerInstance) activeChar.getTarget(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 30492fcbf6..8e5415db79 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -10396,6 +10396,16 @@ public class PlayerInstance extends Playable LOGGER.warning("could not remove char henna: " + e); } + // Add the recovered dyes to the player's inventory and notify them. + getInventory().addItem("Henna", henna.getItemIdDye(), henna.getAmountDyeRequire() / 2, this, null); + + SystemMessage sm = new SystemMessage(SystemMessageId.EARNED_S2_S1_S); + sm.addItemName(henna.getItemIdDye()); + sm.addNumber(henna.getAmountDyeRequire() / 2); + sendPacket(sm); + + _henna[slot] = null; + // Calculate Henna modifiers of this PlayerInstance recalcHennaStats(); @@ -10405,14 +10415,6 @@ public class PlayerInstance extends Playable // Send Server->Client UserInfo packet to this PlayerInstance sendPacket(new UserInfo(this)); - // Add the recovered dyes to the player's inventory and notify them. - getInventory().addItem("Henna", henna.getItemIdDye(), henna.getAmountDyeRequire() / 2, this, null); - - SystemMessage sm = new SystemMessage(SystemMessageId.EARNED_S2_S1_S); - sm.addItemName(henna.getItemIdDye()); - sm.addNumber(henna.getAmountDyeRequire() / 2); - sendPacket(sm); - return true; }