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

TimerHolder cancel task NPE check.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-05-28 22:52:44 +00:00
parent e5b9a0b64d
commit b07ed23778
12 changed files with 36 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java
View File

@@ -103,7 +103,7 @@ public class TimerHolder<T> implements Runnable
} }
/** /**
* @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otheriwse * @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otherwise
*/ */
public boolean cancelTimer() public boolean cancelTimer()
{ {
@@ -117,7 +117,7 @@ public class TimerHolder<T> implements Runnable
TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this); TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this);
} }
if (_task.isCancelled() || _task.isDone()) if ((_task == null) || _task.isCancelled() || _task.isDone())
{ {
return false; return false;
} }
@@ -132,12 +132,7 @@ public class TimerHolder<T> implements Runnable
*/ */
public long getRemainingTime() public long getRemainingTime()
{ {
if (_task == null) if ((_task == null) || _task.isCancelled() || _task.isDone())
{
return -1;
}
if (_task.isCancelled() || _task.isDone())
{ {
return -1; return -1;
} }

11
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java
View File

@@ -103,7 +103,7 @@ public class TimerHolder<T> implements Runnable
} }
/** /**
* @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otheriwse * @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otherwise
*/ */
public boolean cancelTimer() public boolean cancelTimer()
{ {
@@ -117,7 +117,7 @@ public class TimerHolder<T> implements Runnable
TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this); TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this);
} }
if (_task.isCancelled() || _task.isDone()) if ((_task == null) || _task.isCancelled() || _task.isDone())
{ {
return false; return false;
} }
@@ -132,12 +132,7 @@ public class TimerHolder<T> implements Runnable
*/ */
public long getRemainingTime() public long getRemainingTime()
{ {
if (_task == null) if ((_task == null) || _task.isCancelled() || _task.isDone())
{
return -1;
}
if (_task.isCancelled() || _task.isDone())
{ {
return -1; return -1;
} }

11
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java
View File

@@ -103,7 +103,7 @@ public class TimerHolder<T> implements Runnable
} }
/** /**
* @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otheriwse * @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otherwise
*/ */
public boolean cancelTimer() public boolean cancelTimer()
{ {
@@ -117,7 +117,7 @@ public class TimerHolder<T> implements Runnable
TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this); TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this);
} }
if (_task.isCancelled() || _task.isDone()) if ((_task == null) || _task.isCancelled() || _task.isDone())
{ {
return false; return false;
} }
@@ -132,12 +132,7 @@ public class TimerHolder<T> implements Runnable
*/ */
public long getRemainingTime() public long getRemainingTime()
{ {
if (_task == null) if ((_task == null) || _task.isCancelled() || _task.isDone())
{
return -1;
}
if (_task.isCancelled() || _task.isDone())
{ {
return -1; return -1;
} }

11
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java
View File

@@ -103,7 +103,7 @@ public class TimerHolder<T> implements Runnable
} }
/** /**
* @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otheriwse * @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otherwise
*/ */
public boolean cancelTimer() public boolean cancelTimer()
{ {
@@ -117,7 +117,7 @@ public class TimerHolder<T> implements Runnable
TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this); TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this);
} }
if (_task.isCancelled() || _task.isDone()) if ((_task == null) || _task.isCancelled() || _task.isDone())
{ {
return false; return false;
} }
@@ -132,12 +132,7 @@ public class TimerHolder<T> implements Runnable
*/ */
public long getRemainingTime() public long getRemainingTime()
{ {
if (_task == null) if ((_task == null) || _task.isCancelled() || _task.isDone())
{
return -1;
}
if (_task.isCancelled() || _task.isDone())
{ {
return -1; return -1;
} }

11
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java
View File

@@ -103,7 +103,7 @@ public class TimerHolder<T> implements Runnable
} }
/** /**
* @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otheriwse * @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otherwise
*/ */
public boolean cancelTimer() public boolean cancelTimer()
{ {
@@ -117,7 +117,7 @@ public class TimerHolder<T> implements Runnable
TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this); TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this);
} }
if (_task.isCancelled() || _task.isDone()) if ((_task == null) || _task.isCancelled() || _task.isDone())
{ {
return false; return false;
} }
@@ -132,12 +132,7 @@ public class TimerHolder<T> implements Runnable
*/ */
public long getRemainingTime() public long getRemainingTime()
{ {
if (_task == null) if ((_task == null) || _task.isCancelled() || _task.isDone())
{
return -1;
}
if (_task.isCancelled() || _task.isDone())
{ {
return -1; return -1;
} }

11
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java
View File

@@ -103,7 +103,7 @@ public class TimerHolder<T> implements Runnable
} }
/** /**
* @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otheriwse * @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otherwise
*/ */
public boolean cancelTimer() public boolean cancelTimer()
{ {
@@ -117,7 +117,7 @@ public class TimerHolder<T> implements Runnable
TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this); TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this);
} }
if (_task.isCancelled() || _task.isDone()) if ((_task == null) || _task.isCancelled() || _task.isDone())
{ {
return false; return false;
} }
@@ -132,12 +132,7 @@ public class TimerHolder<T> implements Runnable
*/ */
public long getRemainingTime() public long getRemainingTime()
{ {
if (_task == null) if ((_task == null) || _task.isCancelled() || _task.isDone())
{
return -1;
}
if (_task.isCancelled() || _task.isDone())
{ {
return -1; return -1;
} }

11
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java
View File

@@ -103,7 +103,7 @@ public class TimerHolder<T> implements Runnable
} }
/** /**
* @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otheriwse * @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otherwise
*/ */
public boolean cancelTimer() public boolean cancelTimer()
{ {
@@ -117,7 +117,7 @@ public class TimerHolder<T> implements Runnable
TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this); TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this);
} }
if (_task.isCancelled() || _task.isDone()) if ((_task == null) || _task.isCancelled() || _task.isDone())
{ {
return false; return false;
} }
@@ -132,12 +132,7 @@ public class TimerHolder<T> implements Runnable
*/ */
public long getRemainingTime() public long getRemainingTime()
{ {
if (_task == null) if ((_task == null) || _task.isCancelled() || _task.isDone())
{
return -1;
}
if (_task.isCancelled() || _task.isDone())
{ {
return -1; return -1;
} }

11
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java
View File

@@ -103,7 +103,7 @@ public class TimerHolder<T> implements Runnable
} }
/** /**
* @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otheriwse * @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otherwise
*/ */
public boolean cancelTimer() public boolean cancelTimer()
{ {
@@ -117,7 +117,7 @@ public class TimerHolder<T> implements Runnable
TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this); TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this);
} }
if (_task.isCancelled() || _task.isDone()) if ((_task == null) || _task.isCancelled() || _task.isDone())
{ {
return false; return false;
} }
@@ -132,12 +132,7 @@ public class TimerHolder<T> implements Runnable
*/ */
public long getRemainingTime() public long getRemainingTime()
{ {
if (_task == null) if ((_task == null) || _task.isCancelled() || _task.isDone())
{
return -1;
}
if (_task.isCancelled() || _task.isDone())
{ {
return -1; return -1;
} }

11
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java
View File

@@ -103,7 +103,7 @@ public class TimerHolder<T> implements Runnable
} }
/** /**
* @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otheriwse * @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otherwise
*/ */
public boolean cancelTimer() public boolean cancelTimer()
{ {
@@ -117,7 +117,7 @@ public class TimerHolder<T> implements Runnable
TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this); TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this);
} }
if (_task.isCancelled() || _task.isDone()) if ((_task == null) || _task.isCancelled() || _task.isDone())
{ {
return false; return false;
} }
@@ -132,12 +132,7 @@ public class TimerHolder<T> implements Runnable
*/ */
public long getRemainingTime() public long getRemainingTime()
{ {
if (_task == null) if ((_task == null) || _task.isCancelled() || _task.isDone())
{
return -1;
}
if (_task.isCancelled() || _task.isDone())
{ {
return -1; return -1;
} }

11
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java
View File

@@ -103,7 +103,7 @@ public class TimerHolder<T> implements Runnable
} }
/** /**
* @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otheriwse * @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otherwise
*/ */
public boolean cancelTimer() public boolean cancelTimer()
{ {
@@ -117,7 +117,7 @@ public class TimerHolder<T> implements Runnable
TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this); TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this);
} }
if (_task.isCancelled() || _task.isDone()) if ((_task == null) || _task.isCancelled() || _task.isDone())
{ {
return false; return false;
} }
@@ -132,12 +132,7 @@ public class TimerHolder<T> implements Runnable
*/ */
public long getRemainingTime() public long getRemainingTime()
{ {
if (_task == null) if ((_task == null) || _task.isCancelled() || _task.isDone())
{
return -1;
}
if (_task.isCancelled() || _task.isDone())
{ {
return -1; return -1;
} }

11
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java
View File

@@ -103,7 +103,7 @@ public class TimerHolder<T> implements Runnable
} }
/** /**
* @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otheriwse * @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otherwise
*/ */
public boolean cancelTimer() public boolean cancelTimer()
{ {
@@ -117,7 +117,7 @@ public class TimerHolder<T> implements Runnable
TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this); TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this);
} }
if (_task.isCancelled() || _task.isDone()) if ((_task == null) || _task.isCancelled() || _task.isDone())
{ {
return false; return false;
} }
@@ -132,12 +132,7 @@ public class TimerHolder<T> implements Runnable
*/ */
public long getRemainingTime() public long getRemainingTime()
{ {
if (_task == null) if ((_task == null) || _task.isCancelled() || _task.isDone())
{
return -1;
}
if (_task.isCancelled() || _task.isDone())
{ {
return -1; return -1;
} }

11
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java
View File

@@ -103,7 +103,7 @@ public class TimerHolder<T> implements Runnable
} }
/** /**
* @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otheriwse * @return {@code true} if timer for the given event, npc, player were stopped, {@code false} otherwise
*/ */
public boolean cancelTimer() public boolean cancelTimer()
{ {
@@ -117,7 +117,7 @@ public class TimerHolder<T> implements Runnable
TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this); TimersManager.getInstance().unregisterTimer(_player.getObjectId(), this);
} }
if (_task.isCancelled() || _task.isDone()) if ((_task == null) || _task.isCancelled() || _task.isDone())
{ {
return false; return false;
} }
@@ -132,12 +132,7 @@ public class TimerHolder<T> implements Runnable
*/ */
public long getRemainingTime() public long getRemainingTime()
{ {
if (_task == null) if ((_task == null) || _task.isCancelled() || _task.isDone())
{
return -1;
}
if (_task.isCancelled() || _task.isDone())
{ {
return -1; return -1;
} }