Sync with L2jServer HighFive Sep 18th 2015.

2015-09-19 22:37:08 +00:00
parent 339cab601b
commit a2d764aaf8
134 changed files with 1440 additions and 1014 deletions
--- a/trunk/java/com/l2jserver/gameserver/model/skills/SkillChannelizer.java
+++ b/trunk/java/com/l2jserver/gameserver/model/skills/SkillChannelizer.java
@ -92,7 +92,7 @@ public class SkillChannelizer implements Runnable
 		}
 		
 		// Cancel the task and unset it.
-		_task.cancel(false);
+		_task.cancel(true);
 		_task = null;
 		
 		// Cancel target channelization and unset it.
@ -126,7 +126,10 @@ public class SkillChannelizer implements Runnable
 		{
 			return;
 		}
-		
+		if (_skill == null)
+		{
+			return;
+		}
 		try
 		{
 			if (_skill.getMpPerChanneling() > 0)