Proper fix for latest Inventory checkEquipTask revert.

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

View File

@ -1426,19 +1426,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1432,19 +1432,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1432,19 +1432,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1432,19 +1432,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1534,19 +1534,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1616,19 +1616,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1616,19 +1616,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1610,19 +1610,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1592,19 +1592,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1592,19 +1592,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1603,19 +1603,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1603,19 +1603,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1434,19 +1434,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1434,19 +1434,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1536,19 +1536,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1618,19 +1618,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1618,19 +1618,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1612,19 +1612,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1426,19 +1426,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1720,19 +1720,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1729,19 +1729,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1729,19 +1729,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item

View File

@ -1729,19 +1729,27 @@ public abstract class Inventory extends ItemContainer
*/ */
private void checkEquipTask() 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(() -> _skillItemTask = ThreadPool.schedule(() ->
{ {
getOwner().getActingPlayer().setUsingSkillItem(false); player.setUsingSkillItem(false);
getOwner().getStat().recalculateStats(true); player.getStat().recalculateStats(true);
getOwner().updateAbnormalVisualEffects(); player.updateAbnormalVisualEffects();
getOwner().getActingPlayer().sendSkillList(); player.sendSkillList();
_skillItemTask = null; _skillItemTask = null;
}, 50); }, 50);
} }
} }
}
}
/** /**
* @return the mask of wore item * @return the mask of wore item