AttackStanceTaskManager adjustments to match other task managers.

This commit is contained in:
MobiusDevelopment
2020-07-02 23:32:21 +00:00
parent 75bfbb9173
commit 0b96b58d6e
19 changed files with 1123 additions and 1000 deletions

View File

@ -30,34 +30,82 @@ import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop;
/**
* Attack stance task manager.
* @author Luca Baldi, Zoey76
* @author Luca Baldi
*/
public class AttackStanceTaskManager
{
protected static final Logger LOGGER = Logger.getLogger(AttackStanceTaskManager.class.getName());
protected static final Map<Creature, Long> _attackStanceTasks = new ConcurrentHashMap<>();
private static final Logger LOGGER = Logger.getLogger(AttackStanceTaskManager.class.getName());
public static final long COMBAT_TIME = 15000;
private static final Map<Creature, Long> _attackStanceTasks = new ConcurrentHashMap<>();
private static boolean _working = false;
/**
* Instantiates a new attack stance task manager.
*/
protected AttackStanceTaskManager()
{
ThreadPool.scheduleAtFixedRate(new FightModeScheduler(), 0, 1000);
ThreadPool.scheduleAtFixedRate(() ->
{
if (_working)
{
return;
}
_working = true;
final long current = System.currentTimeMillis();
try
{
final Iterator<Entry<Creature, Long>> iterator = _attackStanceTasks.entrySet().iterator();
Entry<Creature, Long> entry;
Creature creature;
while (iterator.hasNext())
{
entry = iterator.next();
if ((current - entry.getValue().longValue()) > COMBAT_TIME)
{
creature = entry.getKey();
if (creature != null)
{
creature.broadcastPacket(new AutoAttackStop(creature.getObjectId()));
creature.getAI().setAutoAttacking(false);
if (creature.isPlayer() && creature.hasSummon())
{
final Summon pet = creature.getPet();
if (pet != null)
{
pet.broadcastPacket(new AutoAttackStop(pet.getObjectId()));
}
creature.getServitors().values().forEach(s -> s.broadcastPacket(new AutoAttackStop(s.getObjectId())));
}
}
iterator.remove();
}
}
}
catch (Exception e)
{
// Unless caught here, players remain in attack positions.
LOGGER.log(Level.WARNING, "Error in AttackStanceTaskManager: " + e.getMessage(), e);
}
_working = false;
}, 0, 1000);
}
/**
* Adds the attack stance task.
* @param actor the actor
* @param creature the actor
*/
public void addAttackStanceTask(Creature actor)
public void addAttackStanceTask(Creature creature)
{
if (actor != null)
if (creature == null)
{
_attackStanceTasks.put(actor, System.currentTimeMillis());
return;
}
_attackStanceTasks.put(creature, System.currentTimeMillis());
}
/**
@ -96,49 +144,6 @@ public class AttackStanceTaskManager
return false;
}
protected class FightModeScheduler implements Runnable
{
@Override
public void run()
{
final long current = System.currentTimeMillis();
try
{
final Iterator<Entry<Creature, Long>> iter = _attackStanceTasks.entrySet().iterator();
Entry<Creature, Long> e;
Creature actor;
while (iter.hasNext())
{
e = iter.next();
if ((current - e.getValue()) > COMBAT_TIME)
{
actor = e.getKey();
if (actor != null)
{
actor.broadcastPacket(new AutoAttackStop(actor.getObjectId()));
actor.getAI().setAutoAttacking(false);
if (actor.isPlayer() && actor.hasSummon())
{
final Summon pet = actor.getPet();
if (pet != null)
{
pet.broadcastPacket(new AutoAttackStop(pet.getObjectId()));
}
actor.getServitors().values().forEach(s -> s.broadcastPacket(new AutoAttackStop(s.getObjectId())));
}
}
iter.remove();
}
}
}
catch (Exception e)
{
// Unless caught here, players remain in attack positions.
LOGGER.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e);
}
}
}
/**
* Gets the single instance of AttackStanceTaskManager.
* @return single instance of AttackStanceTaskManager