瀏覽代碼

Fix few npe for transform skills

Reported by: valanths1990
Zealar 9 年之前
父節點
當前提交
693263bce3
共有 1 個文件被更改,包括 13 次插入2 次删除
  1. 13 2
      L2J_Server/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

+ 13 - 2
L2J_Server/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -12555,7 +12555,7 @@ public final class L2PcInstance extends L2Playable
 			{
 				if (_transformSkills == null)
 				{
-					_transformSkills = new HashMap<>();
+					_transformSkills = new ConcurrentHashMap<>();
 				}
 			}
 		}
@@ -12564,17 +12564,28 @@ public final class L2PcInstance extends L2Playable
 	
 	public Skill getTransformSkill(int id)
 	{
+		if (_transformSkills == null)
+		{
+			return null;
+		}
 		return _transformSkills.get(id);
 	}
 	
 	public boolean hasTransformSkill(int id)
 	{
+		if (_transformSkills == null)
+		{
+			return false;
+		}
 		return _transformSkills.containsKey(id);
 	}
 	
 	public synchronized void removeAllTransformSkills()
 	{
-		_transformSkills = null;
+		if (_transformSkills == null)
+		{
+			_transformSkills = null;
+		}
 	}
 	
 	protected void startFeed(int npcId)