lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper fix for latest Inventory checkEquipTask revert.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-06-29 09:53:04 +00:00
parent f46bd54faa
commit f348221dd6
23 changed files with 391 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1426,19 +1426,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1432,19 +1432,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1432,19 +1432,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1432,19 +1432,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1534,19 +1534,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1616,19 +1616,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1616,19 +1616,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1610,19 +1610,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1592,19 +1592,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1592,19 +1592,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1603,19 +1603,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1603,19 +1603,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1434,19 +1434,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1434,19 +1434,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1536,19 +1536,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1618,19 +1618,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1618,19 +1618,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1612,19 +1612,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1426,19 +1426,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1720,19 +1720,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1729,19 +1729,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1729,19 +1729,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item

20
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1729,19 +1729,27 @@ public abstract class Inventory extends ItemContainer
*/
private void checkEquipTask()
{
if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
if (_skillItemTask == null)
{
getOwner().getActingPlayer().setUsingSkillItem(true);
final Creature owner = getOwner();
if ((owner != null) && owner.isPlayer())
{
final Player player = owner.getActingPlayer();
if (player.hasEnteredWorld())
{
player.setUsingSkillItem(true);
_skillItemTask = ThreadPool.schedule(() ->
{
getOwner().getActingPlayer().setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList();
player.setUsingSkillItem(false);
player.getStat().recalculateStats(true);
player.updateAbnormalVisualEffects();
player.sendSkillList();
_skillItemTask = null;
}, 50);
}
}
}
}
/**
* @return the mask of wore item