lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Default NPC type should be set as Folk.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-11-23 02:07:30 +00:00
parent 3227e80226
commit a8aa0f4917
48 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getInt("level", 85); _level = set.getInt("level", 85);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getInt("level", 85); _level = set.getInt("level", 85);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getInt("level", 85); _level = set.getInt("level", 85);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
View File

@@ -681,7 +681,7 @@ public class NpcTable
final List<NpcTemplate> list = new ArrayList<>(); final List<NpcTemplate> list = new ArrayList<>();
for (NpcTemplate t : _npcs.values()) for (NpcTemplate t : _npcs.values())
{ {
if (t.getName().startsWith(letter) && "Npc".equals(t.getType())) if (t.getName().startsWith(letter) && "Folk".equals(t.getType()))
{ {
list.add(t); list.add(t);
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
View File

@@ -681,7 +681,7 @@ public class NpcTable
final List<NpcTemplate> list = new ArrayList<>(); final List<NpcTemplate> list = new ArrayList<>();
for (NpcTemplate t : _npcs.values()) for (NpcTemplate t : _npcs.values())
{ {
if (t.getName().startsWith(letter) && "Npc".equals(t.getType())) if (t.getName().startsWith(letter) && "Folk".equals(t.getType()))
{ {
list.add(t); list.add(t);
} }

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -761,7 +761,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -121,7 +121,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -761,7 +761,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -121,7 +121,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -133,7 +133,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -133,7 +133,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -764,7 +764,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -133,7 +133,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -767,7 +767,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -136,7 +136,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -767,7 +767,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -136,7 +136,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -767,7 +767,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -136,7 +136,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -774,7 +774,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -132,7 +132,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getByte("level", (byte) 70); _level = set.getByte("level", (byte) 70);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -788,7 +788,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -135,7 +135,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getInt("level", 85); _level = set.getInt("level", 85);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -788,7 +788,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -135,7 +135,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getInt("level", 85); _level = set.getInt("level", 85);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");

2
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -788,7 +788,7 @@ public class NpcData implements IXmlReader
*/ */
public List<NpcTemplate> getAllNpcStartingWith(String text) public List<NpcTemplate> getAllNpcStartingWith(String text)
{ {
return getTemplates(template -> template.isType("Npc") && template.getName().startsWith(text)); return getTemplates(template -> template.isType("Folk") && template.getName().startsWith(text));
} }
/** /**

2
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -135,7 +135,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
_id = set.getInt("id"); _id = set.getInt("id");
_displayId = set.getInt("displayId", _id); _displayId = set.getInt("displayId", _id);
_level = set.getInt("level", 85); _level = set.getInt("level", 85);
_type = set.getString("type", "Npc"); _type = set.getString("type", "Folk");
_name = set.getString("name", ""); _name = set.getString("name", "");
_usingServerSideName = set.getBoolean("usingServerSideName", false); _usingServerSideName = set.getBoolean("usingServerSideName", false);
_title = set.getString("title", ""); _title = set.getString("title", "");