From 00f8629732775e9cb62e8d0cc5837bd61d3b4a16 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 28 Jun 2022 11:54:52 +0000 Subject: [PATCH] Reverted latest Inventory checkEquipTask changes. --- .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ .../model/itemcontainer/Inventory.java | 25 +++++++------------ 23 files changed, 207 insertions(+), 368 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index a8de480f56..78bac08bd5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1426,24 +1426,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index a3216c4005..88cd0ebdf3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1432,24 +1432,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index a3216c4005..88cd0ebdf3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1432,24 +1432,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index dcdd36e7fe..ed552364d9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1432,24 +1432,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 6b66ff741a..a8ec81d6af 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1534,24 +1534,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 6d25e774ea..998fcb6f21 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1616,24 +1616,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 6d25e774ea..998fcb6f21 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1616,24 +1616,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index b0d8159710..2710aaf2b6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1610,24 +1610,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 256b0e101b..2312258df6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1592,24 +1592,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 256b0e101b..2312258df6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1592,24 +1592,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 7e30810439..965207424a 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1603,24 +1603,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 7e30810439..965207424a 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1603,24 +1603,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index b7e1813be7..cb5f70a595 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1434,24 +1434,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index b7e1813be7..cb5f70a595 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1434,24 +1434,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index a8afded375..426820e765 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1536,24 +1536,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 6f8d9bcbf9..584c900aef 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1618,24 +1618,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 6f8d9bcbf9..584c900aef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1618,24 +1618,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 9336f00f73..28f1d07c13 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1612,24 +1612,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e623491691..c3962abe78 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1426,24 +1426,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 60615ae5b8..87e8da66c4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1720,24 +1720,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e99de08d1f..9ccf975242 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1729,24 +1729,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e99de08d1f..9ccf975242 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1729,24 +1729,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e99de08d1f..9ccf975242 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1729,24 +1729,17 @@ public abstract class Inventory extends ItemContainer */ private void checkEquipTask() { - if (_skillItemTask == null) + if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld()) { - final Creature owner = getOwner(); - if ((owner != null) && owner.isPlayer()) + getOwner().getActingPlayer().setUsingSkillItem(true); + _skillItemTask = ThreadPool.schedule(() -> { - final Player player = owner.getActingPlayer(); - if (player.hasEnteredWorld()) - { - _skillItemTask = ThreadPool.schedule(() -> - { - player.setUsingSkillItem(false); - player.getStat().recalculateStats(true); - player.updateAbnormalVisualEffects(); - player.sendSkillList(); - _skillItemTask = null; - }, 50); - } - } + getOwner().getActingPlayer().setUsingSkillItem(false); + getOwner().getStat().recalculateStats(true); + getOwner().updateAbnormalVisualEffects(); + getOwner().getActingPlayer().sendSkillList(); + _skillItemTask = null; + }, 50); } }