From aa513cec84e534c77300d3a7496ee1cfbeb92ac3 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 24 Dec 2022 08:21:52 +0000 Subject: [PATCH] Make sure Exilir item is used before setting variables. Contributed by MacuK. --- .../data/scripts/handlers/itemhandlers/Elixir.java | 12 ++++++++---- .../data/scripts/handlers/itemhandlers/Elixir.java | 12 ++++++++---- .../data/scripts/handlers/itemhandlers/Elixir.java | 12 ++++++++---- .../data/scripts/handlers/itemhandlers/Elixir.java | 12 ++++++++---- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index 6f5e98599f..d6d3acd7b3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -48,9 +48,13 @@ public class Elixir extends ItemSkills return false; } - playable.getActingPlayer().getVariables().set(PlayerVariables.ELIXIRS_AVAILABLE, elixirsAvailable + 1); - playable.sendPacket(new SystemMessage(SystemMessageId.THANKS_TO_THE_ELIXIR_CHARACTER_S_STAT_POINTS_S1).addInt(1)); - playable.getActingPlayer().broadcastUserInfo(); - return super.useItem(playable, item, forceUse); + if (super.useItem(playable, item, forceUse)) + { + playable.getActingPlayer().getVariables().set(PlayerVariables.ELIXIRS_AVAILABLE, elixirsAvailable + 1); + playable.sendPacket(new SystemMessage(SystemMessageId.THANKS_TO_THE_ELIXIR_CHARACTER_S_STAT_POINTS_S1).addInt(1)); + playable.getActingPlayer().broadcastUserInfo(); + return true; + } + return false; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index 6f5e98599f..d6d3acd7b3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -48,9 +48,13 @@ public class Elixir extends ItemSkills return false; } - playable.getActingPlayer().getVariables().set(PlayerVariables.ELIXIRS_AVAILABLE, elixirsAvailable + 1); - playable.sendPacket(new SystemMessage(SystemMessageId.THANKS_TO_THE_ELIXIR_CHARACTER_S_STAT_POINTS_S1).addInt(1)); - playable.getActingPlayer().broadcastUserInfo(); - return super.useItem(playable, item, forceUse); + if (super.useItem(playable, item, forceUse)) + { + playable.getActingPlayer().getVariables().set(PlayerVariables.ELIXIRS_AVAILABLE, elixirsAvailable + 1); + playable.sendPacket(new SystemMessage(SystemMessageId.THANKS_TO_THE_ELIXIR_CHARACTER_S_STAT_POINTS_S1).addInt(1)); + playable.getActingPlayer().broadcastUserInfo(); + return true; + } + return false; } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index f5b82a5c52..6c2145760e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -52,9 +52,13 @@ public class Elixir extends ItemSkills return false; } - playable.getActingPlayer().getVariables().set(PlayerVariables.ELIXIRS_AVAILABLE, elixirsAvailable + 1); - playable.sendPacket(new SystemMessage(SystemMessageId.THANKS_TO_THE_ELIXIR_CHARACTER_S_STAT_POINTS_S1).addInt(1)); - playable.getActingPlayer().broadcastUserInfo(); - return super.useItem(playable, item, forceUse); + if (super.useItem(playable, item, forceUse)) + { + playable.getActingPlayer().getVariables().set(PlayerVariables.ELIXIRS_AVAILABLE, elixirsAvailable + 1); + playable.sendPacket(new SystemMessage(SystemMessageId.THANKS_TO_THE_ELIXIR_CHARACTER_S_STAT_POINTS_S1).addInt(1)); + playable.getActingPlayer().broadcastUserInfo(); + return true; + } + return false; } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index f5b82a5c52..6c2145760e 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -52,9 +52,13 @@ public class Elixir extends ItemSkills return false; } - playable.getActingPlayer().getVariables().set(PlayerVariables.ELIXIRS_AVAILABLE, elixirsAvailable + 1); - playable.sendPacket(new SystemMessage(SystemMessageId.THANKS_TO_THE_ELIXIR_CHARACTER_S_STAT_POINTS_S1).addInt(1)); - playable.getActingPlayer().broadcastUserInfo(); - return super.useItem(playable, item, forceUse); + if (super.useItem(playable, item, forceUse)) + { + playable.getActingPlayer().getVariables().set(PlayerVariables.ELIXIRS_AVAILABLE, elixirsAvailable + 1); + playable.sendPacket(new SystemMessage(SystemMessageId.THANKS_TO_THE_ELIXIR_CHARACTER_S_STAT_POINTS_S1).addInt(1)); + playable.getActingPlayer().broadcastUserInfo(); + return true; + } + return false; } }