diff --git a/trunk/dist/game/config/Custom.ini b/trunk/dist/game/config/Custom.ini
index a2eff118cd..811656531b 100644
--- a/trunk/dist/game/config/Custom.ini
+++ b/trunk/dist/game/config/Custom.ini
@@ -615,11 +615,11 @@ EnableFactionSystem = False
# Default: 85332,16199,-1252
StartingLocation = 85332,16199,-1252
-# Faction manager npc id.
-# Default: 109
-FactionManagerNpcId = 109
+# Faction manager NPC ID.
+# Default: 500
+FactionManagerNpcId = 500
-# Spawn location for faction manager npc.
+# Spawn location for faction manager NPC.
# Default: 85712,15974,-1260,26808
ManagerSpawnLocation = 85712,15974,-1260,26808
@@ -648,8 +648,8 @@ GoodNameColor = 00FF00
EvilNameColor = 0000FF
# Enable faction guards.
-# The npc template must have faction as clan.
-# Test guard ids 31033(Good), 31036(Evil).
+# The NPC template must have faction as clan.
+# Guard IDs 501(Good), 502(Evil).
# Default: True
EnableFactionGuards = True
diff --git a/trunk/dist/game/data/stats/npcs/31000-31099.xml b/trunk/dist/game/data/stats/npcs/31000-31099.xml
index 234b0527f8..2c61f53243 100644
--- a/trunk/dist/game/data/stats/npcs/31000-31099.xml
+++ b/trunk/dist/game/data/stats/npcs/31000-31099.xml
@@ -1247,7 +1247,7 @@
MALE
-
+
diff --git a/trunk/dist/game/data/stats/npcs/custom/factions.xml b/trunk/dist/game/data/stats/npcs/custom/factions.xml
new file mode 100644
index 0000000000..f0883a416e
--- /dev/null
+++ b/trunk/dist/game/data/stats/npcs/custom/factions.xml
@@ -0,0 +1,107 @@
+
+
+
+ ELF
+ FEMALE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ELF
+ MALE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ GOOD
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ORC
+ MALE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ EVIL
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/java/com/l2jmobius/Config.java b/trunk/java/com/l2jmobius/Config.java
index 594a9dc439..6c375aa691 100644
--- a/trunk/java/com/l2jmobius/Config.java
+++ b/trunk/java/com/l2jmobius/Config.java
@@ -2587,7 +2587,7 @@ public final class Config
FACTION_SYSTEM_ENABLED = Boolean.valueOf(CustomSettings.getBoolean("EnableFactionSystem", false));
tempString = CustomSettings.getString("StartingLocation", "85332,16199,-1252").split(",");
FACTION_STARTING_LOCATION = new Location(Integer.parseInt(tempString[0]), Integer.parseInt(tempString[1]), Integer.parseInt(tempString[2]));
- FACTION_MANAGER_NPCID = CustomSettings.getInt("FactionManagerNpcId", 109);
+ FACTION_MANAGER_NPCID = CustomSettings.getInt("FactionManagerNpcId", 500);
tempString = CustomSettings.getString("ManagerSpawnLocation", "85712,15974,-1260,26808").split(",");
FACTION_MANAGER_LOCATION = new Location(Integer.parseInt(tempString[0]), Integer.parseInt(tempString[1]), Integer.parseInt(tempString[2]), tempString[3] != null ? Integer.parseInt(tempString[3]) : 0);
tempString = CustomSettings.getString("GoodBaseLocation", "45306,48878,-3058").split(",");
diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java
index 7a47b31fbe..2e842b48b1 100644
--- a/trunk/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java
+++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java
@@ -53,7 +53,7 @@ public class FactionManager
while (rs.next())
{
final int id = rs.getInt(1);
- _playerFactions.put(id, rs.getInt(4));
+ _playerFactions.put(id, rs.getInt(2));
}
}
catch (SQLException e)