Bladeren bron

BETA: Fixing little typo with npc showName/targetable seems i swapped them in first implementation.

Rumen Nikiforov 12 jaren geleden
bovenliggende
commit
e0aed2f577

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcTable.java

@@ -824,8 +824,8 @@ public class NpcTable
 					npcAIDat.setMaxSkillChance(rs.getInt("maxSkillChance"));
 					npcAIDat.setAggro(rs.getInt("aggro"));
 					npcAIDat.setCanMove(rs.getInt("canMove"));
-					npcAIDat.setShowName(rs.getBoolean("showName"));
-					npcAIDat.setTargetable(rs.getBoolean("targetable"));
+					npcAIDat.setShowName(rs.getInt("showName") == 1);
+					npcAIDat.setTargetable(rs.getInt("targetable") == 1);
 					npcAIDat.setSoulShot(rs.getInt("soulshot"));
 					npcAIDat.setSpiritShot(rs.getInt("spiritshot"));
 					npcAIDat.setSoulShotChance(rs.getInt("ssChance"));

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/AbstractNpcInfo.java

@@ -178,8 +178,8 @@ public abstract class AbstractNpcInfo extends L2GameServerPacket
 			writeD(_npc.isFlying() ? 1 : 0); // C6
 			writeD(0x00);
 			writeD(_npc.getColorEffect()); // CT1.5 Pet form and skills, Color effect
-			writeC(_npc.isShowName() ? 0x01 : 0x00);
 			writeC(_npc.isTargetable() ? 0x01 : 0x00);
+			writeC(_npc.isShowName() ? 0x01 : 0x00);
 			writeD(_npc.getSpecialEffect());
 			writeD(_displayEffect);
 		}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/CharInfo.java

@@ -170,8 +170,8 @@ public class CharInfo extends L2GameServerPacket
 				writeD(0x00);
 				
 				writeD(0x00); // CT1.5 Pet form and skills, Color effect
-				writeC(template.getAIDataStatic().showName() ? 0x01 : 0x00); // show name
 				writeC(template.getAIDataStatic().isTargetable() ? 0x01 : 0x00); // targetable
+				writeC(template.getAIDataStatic().showName() ? 0x01 : 0x00); // show name
 				writeC(_activeChar.getSpecialEffect());
 				writeD(0x00);
 			}