Przeglądaj źródła

- "Gm Room/Jail are not pvp zones in retail, at least not by default", MELERIX
- hair accessories are hair2 slot

janiii 15 lat temu
rodzic
commit
c0977710ae

+ 1 - 1
L2_GameServer/java/com/l2jserver/Config.java

@@ -1699,7 +1699,7 @@ public final class Config
 					DEFAULT_PUNISH = Integer.parseInt(General.getProperty("DefaultPunish", "2"));
 					DEFAULT_PUNISH = Integer.parseInt(General.getProperty("DefaultPunish", "2"));
 					DEFAULT_PUNISH_PARAM = Integer.parseInt(General.getProperty("DefaultPunishParam", "0"));
 					DEFAULT_PUNISH_PARAM = Integer.parseInt(General.getProperty("DefaultPunishParam", "0"));
 					ONLY_GM_ITEMS_FREE = Boolean.parseBoolean(General.getProperty("OnlyGMItemsFree", "True"));
 					ONLY_GM_ITEMS_FREE = Boolean.parseBoolean(General.getProperty("OnlyGMItemsFree", "True"));
-					JAIL_IS_PVP = Boolean.parseBoolean(General.getProperty("JailIsPvp", "True"));
+					JAIL_IS_PVP = Boolean.parseBoolean(General.getProperty("JailIsPvp", "False"));
 					JAIL_DISABLE_CHAT = Boolean.parseBoolean(General.getProperty("JailDisableChat", "True"));
 					JAIL_DISABLE_CHAT = Boolean.parseBoolean(General.getProperty("JailDisableChat", "True"));
 					JAIL_DISABLE_TRANSACTION = Boolean.parseBoolean(General.getProperty("JailDisableTransaction", "False"));
 					JAIL_DISABLE_TRANSACTION = Boolean.parseBoolean(General.getProperty("JailDisableTransaction", "False"));
 					CUSTOM_SPAWNLIST_TABLE = Boolean.valueOf(General.getProperty("CustomSpawnlistTable", "false"));
 					CUSTOM_SPAWNLIST_TABLE = Boolean.valueOf(General.getProperty("CustomSpawnlistTable", "false"));

+ 3 - 3
L2_GameServer/java/com/l2jserver/gameserver/datatables/ItemTable.java

@@ -141,10 +141,10 @@ public class ItemTable
 		_slots.put("chest", L2Item.SLOT_CHEST);
 		_slots.put("chest", L2Item.SLOT_CHEST);
 		_slots.put("fullarmor", L2Item.SLOT_FULL_ARMOR);
 		_slots.put("fullarmor", L2Item.SLOT_FULL_ARMOR);
 		_slots.put("head", L2Item.SLOT_HEAD);
 		_slots.put("head", L2Item.SLOT_HEAD);
-		_slots.put("hair", L2Item.SLOT_HAIR);
+		_slots.put("hair", L2Item.SLOT_HAIR2);
 		_slots.put("face", L2Item.SLOT_HAIR);
 		_slots.put("face", L2Item.SLOT_HAIR);
-		_slots.put("hair2", L2Item.SLOT_HAIR2);
-		_slots.put("dhair", L2Item.SLOT_HAIRALL);
+		//_slots.put("hair2", L2Item.SLOT_HAIR2); //not used in db anymore
+		//_slots.put("dhair", L2Item.SLOT_HAIRALL); //not used in db anymore
 		_slots.put("hairall", L2Item.SLOT_HAIRALL);
 		_slots.put("hairall", L2Item.SLOT_HAIRALL);
 		_slots.put("underwear", L2Item.SLOT_UNDERWEAR);
 		_slots.put("underwear", L2Item.SLOT_UNDERWEAR);
 		_slots.put("back", L2Item.SLOT_BACK);
 		_slots.put("back", L2Item.SLOT_BACK);

+ 2 - 2
L2_GameServer/java/config/General.properties

@@ -607,8 +607,8 @@ DefaultPunishParam = 0
 OnlyGMItemsFree = True
 OnlyGMItemsFree = True
 
 
 # Jail is a PvP zone.
 # Jail is a PvP zone.
-# Default: True
-JailIsPvp = True
+# Default: False
+JailIsPvp = False
 
 
 # Disable all chat in jail (except normal one)
 # Disable all chat in jail (except normal one)
 # Default: True
 # Default: True