2
0
Эх сурвалжийг харах

BETA: Typo fix for NpcTable now it will load targetable, showName, aggro from custom npcs as well thanks tukune, DareStrike, VlLight

Rumen Nikiforov 13 жил өмнө
parent
commit
446c75d683

+ 6 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcTable.java

@@ -865,7 +865,10 @@ public class NpcTable
 				npcAIDat.setPrimarySkillId(rset.getInt("primarySkillId"));
 				npcAIDat.setPrimarySkillId(rset.getInt("primarySkillId"));
 				npcAIDat.setMinSkillChance(rset.getInt("minSkillChance"));
 				npcAIDat.setMinSkillChance(rset.getInt("minSkillChance"));
 				npcAIDat.setMaxSkillChance(rset.getInt("maxSkillChance"));
 				npcAIDat.setMaxSkillChance(rset.getInt("maxSkillChance"));
+				npcAIDat.setAggro(rset.getInt("aggro"));
 				npcAIDat.setCanMove(rset.getInt("canMove"));
 				npcAIDat.setCanMove(rset.getInt("canMove"));
+				npcAIDat.setShowName(rset.getBoolean("showName"));
+				npcAIDat.setTargetable(rset.getBoolean("targetable"));
 				npcAIDat.setSoulShot(rset.getInt("soulshot"));
 				npcAIDat.setSoulShot(rset.getInt("soulshot"));
 				npcAIDat.setSpiritShot(rset.getInt("spiritshot"));
 				npcAIDat.setSpiritShot(rset.getInt("spiritshot"));
 				npcAIDat.setSoulShotChance(rset.getInt("ssChance"));
 				npcAIDat.setSoulShotChance(rset.getInt("ssChance"));
@@ -881,9 +884,6 @@ public class NpcTable
 				npcAIDat.setEnemyRange(rset.getInt("enemyRange"));
 				npcAIDat.setEnemyRange(rset.getInt("enemyRange"));
 				npcAIDat.setDodge(rset.getInt("dodge"));
 				npcAIDat.setDodge(rset.getInt("dodge"));
 				npcAIDat.setAi(rset.getString("aiType"));
 				npcAIDat.setAi(rset.getString("aiType"));
-				npcAIDat.setAggro(rset.getInt("aggro"));
-				npcAIDat.setShowName(rset.getBoolean("showName"));
-				npcAIDat.setTargetable(rset.getBoolean("targetable"));
 				
 				
 				npcDat.setAIData(npcAIDat);
 				npcDat.setAIData(npcAIDat);
 				cont++;
 				cont++;
@@ -920,7 +920,10 @@ public class NpcTable
 					npcAIDat.setPrimarySkillId(rset.getInt("primarySkillId"));
 					npcAIDat.setPrimarySkillId(rset.getInt("primarySkillId"));
 					npcAIDat.setMinSkillChance(rset.getInt("minSkillChance"));
 					npcAIDat.setMinSkillChance(rset.getInt("minSkillChance"));
 					npcAIDat.setMaxSkillChance(rset.getInt("maxSkillChance"));
 					npcAIDat.setMaxSkillChance(rset.getInt("maxSkillChance"));
+					npcAIDat.setAggro(rset.getInt("aggro"));
 					npcAIDat.setCanMove(rset.getInt("canMove"));
 					npcAIDat.setCanMove(rset.getInt("canMove"));
+					npcAIDat.setShowName(rset.getBoolean("showName"));
+					npcAIDat.setTargetable(rset.getBoolean("targetable"));
 					npcAIDat.setSoulShot(rset.getInt("soulshot"));
 					npcAIDat.setSoulShot(rset.getInt("soulshot"));
 					npcAIDat.setSpiritShot(rset.getInt("spiritshot"));
 					npcAIDat.setSpiritShot(rset.getInt("spiritshot"));
 					npcAIDat.setSoulShotChance(rset.getInt("ssChance"));
 					npcAIDat.setSoulShotChance(rset.getInt("ssChance"));