-Misc clean up/refactor.

-Removed unnecessary Map.containsKey calls
-Using java 8 methods where possible to avoid external checks.

Source L2J HighFive branch:
9d0fee8537
This commit is contained in:
mobius
2015-02-09 13:49:08 +00:00
parent 2dd69863cc
commit f9a65fe3c1
13 changed files with 36 additions and 99 deletions

View File

@@ -334,9 +334,9 @@ public final class WalkingManager implements IXmlReader
*/
public synchronized void cancelMoving(L2Npc npc)
{
if (_activeRoutes.containsKey(npc.getObjectId()))
final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
if (walk != null)
{
final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
walk.getWalkCheckTask().cancel(true);
npc.getKnownList().stopTrackingTask();
}
@@ -348,15 +348,13 @@ public final class WalkingManager implements IXmlReader
*/
public void resumeMoving(final L2Npc npc)
{
if (!_activeRoutes.containsKey(npc.getObjectId()))
{
return;
}
final WalkInfo walk = _activeRoutes.get(npc.getObjectId());
walk.setSuspended(false);
walk.setStoppedByAttack(false);
startMoving(npc, walk.getRoute().getName());
if (walk != null)
{
walk.setSuspended(false);
walk.setStoppedByAttack(false);
startMoving(npc, walk.getRoute().getName());
}
}
/**