_DS_ 15 ani în urmă
părinte
comite
d40c6815cc

+ 6 - 3
L2_GameServer/java/com/l2jserver/gameserver/model/L2Effect.java

@@ -422,9 +422,12 @@ public abstract class L2Effect
 		{
 			synchronized (_currentFuture)
 			{
-				// Cancel the task
-				_currentFuture.cancel(false);
-				ThreadPoolManager.getInstance().removeEffect(_currentTask);
+				if (_currentFuture != null)
+				{
+					// Cancel the task
+					_currentFuture.cancel(false);
+					ThreadPoolManager.getInstance().removeEffect(_currentTask);
+				}
 			}
 			_currentFuture = null;
 			_currentTask = null;