浏览代码

BETA: Minor NPE fix.

Reported by: d!g0
Zoey76 11 年之前
父节点
当前提交
3571cbbf2b
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -2382,17 +2382,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			return true;
 		}
 		
-		if ((_disabledSkills == null) || !_disabledSkills.containsKey(hashCode))
+		if (_disabledSkills == null)
 		{
 			return false;
 		}
 		
-		if (_disabledSkills.get(hashCode) < System.currentTimeMillis())
+		final Long stamp = _disabledSkills.get(hashCode);
+		if ((stamp != null) && (stamp < System.currentTimeMillis()))
 		{
 			_disabledSkills.remove(hashCode);
 			return false;
 		}
-		
 		return true;
 	}