소스 검색

fix npe for race also in ConditionTargetRaceId (changed the npe fix in l2npc)

janiii 16 년 전
부모
커밋
5bdb02652d

+ 4 - 9
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/L2Npc.java

@@ -908,15 +908,10 @@ public class L2Npc extends L2Character
 					String.valueOf(getPAtkSpd()),
 					"</td><td>Cast.Speed</td><td>",
 					String.valueOf(getMAtkSpd()),
-					"</td></tr>"
-					);
-			if (getTemplate().race != null)
-				StringUtil.append(html1,
-						"<tr><td>Race</td><td>",
-						getTemplate().race.toString(),
-						"</td><td></td><td></td></tr>"
-						);
-			StringUtil.append(html1,
+					"</td></tr>" +
+					"<tr><td>Race</td><td>",
+					getTemplate().getRace().toString(),
+					"</td><td></td><td></td></tr>" +
 					"</table>" +
 					"<br><center><font color=\"LEVEL\">[Basic Stats]</font></center>" +
 					"<table border=0 width=\"100%\">" +

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetRaceId.java

@@ -37,6 +37,6 @@ public class ConditionTargetRaceId extends Condition
 	{
 		if (!(env.target instanceof L2Npc))
 			return false;
-		return (_raceIds.contains(((L2Npc)env.target).getTemplate().race.ordinal()));
+		return (_raceIds.contains(((L2Npc)env.target).getTemplate().getRace().ordinal()));
 	}
 }