Reverted latest Inventory checkEquipTask changes.

This commit is contained in:
MobiusDevelopment
2022-06-28 11:54:52 +00:00
parent 7c3f8bf3b7
commit 00f8629732
23 changed files with 207 additions and 368 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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