diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/TimedHuntingZoneData.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/TimedHuntingZoneData.xml index 1bb5d6b155..ca505bdd9d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/TimedHuntingZoneData.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/TimedHuntingZoneData.xml @@ -55,6 +55,7 @@ 110 130 true + true 181409,-78389,-2728 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/TimedHuntingZoneData.xsd b/L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/TimedHuntingZoneData.xsd index 5e4408d5f8..086251165c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/TimedHuntingZoneData.xsd +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/TimedHuntingZoneData.xsd @@ -19,6 +19,7 @@ + diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java index 7fb23816fa..6606ae8fe1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java @@ -90,6 +90,7 @@ public class TimedHuntingZoneData implements IXmlReader int instanceId = 0; boolean soloInstance = true; boolean weekly = false; + boolean useWorldPrefix = false; Location enterLocation = null; Location exitLocation = null; for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) @@ -168,9 +169,14 @@ public class TimedHuntingZoneData implements IXmlReader weekly = Boolean.parseBoolean(zoneNode.getTextContent()); break; } + case "useWorldPrefix": + { + useWorldPrefix = Boolean.parseBoolean(zoneNode.getTextContent()); + break; + } } } - _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, enterLocation, exitLocation)); + _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, useWorldPrefix, enterLocation, exitLocation)); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java index 60dc7be542..7b4f4d1b31 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java @@ -38,12 +38,13 @@ public class TimedHuntingZoneHolder private final int _instanceId; private final boolean _soloInstance; private final boolean _weekly; + private final boolean _useWorldPrefix; private final Location _enterLocation; private final Location _exitLocation; private final int _mapX; private final int _mapY; - public TimedHuntingZoneHolder(int id, String name, int initialTime, int maximumAddedTime, int resetDelay, int entryItemId, int entryFee, int minLevel, int maxLevel, int remainRefillTime, int refillTimeMax, int instanceId, boolean soloInstance, boolean weekly, Location enterLocation, Location exitLocation) + public TimedHuntingZoneHolder(int id, String name, int initialTime, int maximumAddedTime, int resetDelay, int entryItemId, int entryFee, int minLevel, int maxLevel, int remainRefillTime, int refillTimeMax, int instanceId, boolean soloInstance, boolean weekly, boolean useWorldPrefix, Location enterLocation, Location exitLocation) { _id = id; _name = name; @@ -59,6 +60,7 @@ public class TimedHuntingZoneHolder _instanceId = instanceId; _soloInstance = soloInstance; _weekly = weekly; + _useWorldPrefix = useWorldPrefix; _enterLocation = enterLocation; _exitLocation = exitLocation; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; @@ -135,6 +137,11 @@ public class TimedHuntingZoneHolder return _weekly; } + public boolean useWorldPrefix() + { + return _useWorldPrefix; + } + public Location getEnterLocation() { return _enterLocation; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 349b30652e..64b555536f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -70,7 +70,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket packet.writeC(0); // bCanReEnter packet.writeC(0); // bIsInZonePCCafeUserOnly packet.writeC(0); // bIsPCCafeUser - packet.writeC(0); // bWorldInZone + packet.writeC(holder.useWorldPrefix() ? 1 : 0); // bWorldInZone } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/TimedHuntingZoneData.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/TimedHuntingZoneData.xml index 8f8e270ef3..216ea960a5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/TimedHuntingZoneData.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/TimedHuntingZoneData.xml @@ -57,6 +57,7 @@ 110 130 true + true 181409,-78389,-2728 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/xsd/TimedHuntingZoneData.xsd b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/xsd/TimedHuntingZoneData.xsd index 5e4408d5f8..086251165c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/xsd/TimedHuntingZoneData.xsd +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/xsd/TimedHuntingZoneData.xsd @@ -19,6 +19,7 @@ + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java index 7fb23816fa..6606ae8fe1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java @@ -90,6 +90,7 @@ public class TimedHuntingZoneData implements IXmlReader int instanceId = 0; boolean soloInstance = true; boolean weekly = false; + boolean useWorldPrefix = false; Location enterLocation = null; Location exitLocation = null; for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) @@ -168,9 +169,14 @@ public class TimedHuntingZoneData implements IXmlReader weekly = Boolean.parseBoolean(zoneNode.getTextContent()); break; } + case "useWorldPrefix": + { + useWorldPrefix = Boolean.parseBoolean(zoneNode.getTextContent()); + break; + } } } - _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, enterLocation, exitLocation)); + _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, useWorldPrefix, enterLocation, exitLocation)); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java index 60dc7be542..7b4f4d1b31 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java @@ -38,12 +38,13 @@ public class TimedHuntingZoneHolder private final int _instanceId; private final boolean _soloInstance; private final boolean _weekly; + private final boolean _useWorldPrefix; private final Location _enterLocation; private final Location _exitLocation; private final int _mapX; private final int _mapY; - public TimedHuntingZoneHolder(int id, String name, int initialTime, int maximumAddedTime, int resetDelay, int entryItemId, int entryFee, int minLevel, int maxLevel, int remainRefillTime, int refillTimeMax, int instanceId, boolean soloInstance, boolean weekly, Location enterLocation, Location exitLocation) + public TimedHuntingZoneHolder(int id, String name, int initialTime, int maximumAddedTime, int resetDelay, int entryItemId, int entryFee, int minLevel, int maxLevel, int remainRefillTime, int refillTimeMax, int instanceId, boolean soloInstance, boolean weekly, boolean useWorldPrefix, Location enterLocation, Location exitLocation) { _id = id; _name = name; @@ -59,6 +60,7 @@ public class TimedHuntingZoneHolder _instanceId = instanceId; _soloInstance = soloInstance; _weekly = weekly; + _useWorldPrefix = useWorldPrefix; _enterLocation = enterLocation; _exitLocation = exitLocation; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; @@ -135,6 +137,11 @@ public class TimedHuntingZoneHolder return _weekly; } + public boolean useWorldPrefix() + { + return _useWorldPrefix; + } + public Location getEnterLocation() { return _enterLocation; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 349b30652e..64b555536f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -70,7 +70,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket packet.writeC(0); // bCanReEnter packet.writeC(0); // bIsInZonePCCafeUserOnly packet.writeC(0); // bIsPCCafeUser - packet.writeC(0); // bWorldInZone + packet.writeC(holder.useWorldPrefix() ? 1 : 0); // bWorldInZone } return true; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/TimedHuntingZoneData.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/TimedHuntingZoneData.xml index 142edae940..d5e3cb3b0c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/TimedHuntingZoneData.xml +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/TimedHuntingZoneData.xml @@ -69,6 +69,7 @@ 110 130 true + true 181409,-78389,-2728 diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/xsd/TimedHuntingZoneData.xsd b/L2J_Mobius_10.0_MasterClass/dist/game/data/xsd/TimedHuntingZoneData.xsd index 5e4408d5f8..086251165c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/xsd/TimedHuntingZoneData.xsd +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/xsd/TimedHuntingZoneData.xsd @@ -19,6 +19,7 @@ + diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java index 7fb23816fa..6606ae8fe1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java @@ -90,6 +90,7 @@ public class TimedHuntingZoneData implements IXmlReader int instanceId = 0; boolean soloInstance = true; boolean weekly = false; + boolean useWorldPrefix = false; Location enterLocation = null; Location exitLocation = null; for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) @@ -168,9 +169,14 @@ public class TimedHuntingZoneData implements IXmlReader weekly = Boolean.parseBoolean(zoneNode.getTextContent()); break; } + case "useWorldPrefix": + { + useWorldPrefix = Boolean.parseBoolean(zoneNode.getTextContent()); + break; + } } } - _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, enterLocation, exitLocation)); + _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, useWorldPrefix, enterLocation, exitLocation)); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java index 60dc7be542..7b4f4d1b31 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java @@ -38,12 +38,13 @@ public class TimedHuntingZoneHolder private final int _instanceId; private final boolean _soloInstance; private final boolean _weekly; + private final boolean _useWorldPrefix; private final Location _enterLocation; private final Location _exitLocation; private final int _mapX; private final int _mapY; - public TimedHuntingZoneHolder(int id, String name, int initialTime, int maximumAddedTime, int resetDelay, int entryItemId, int entryFee, int minLevel, int maxLevel, int remainRefillTime, int refillTimeMax, int instanceId, boolean soloInstance, boolean weekly, Location enterLocation, Location exitLocation) + public TimedHuntingZoneHolder(int id, String name, int initialTime, int maximumAddedTime, int resetDelay, int entryItemId, int entryFee, int minLevel, int maxLevel, int remainRefillTime, int refillTimeMax, int instanceId, boolean soloInstance, boolean weekly, boolean useWorldPrefix, Location enterLocation, Location exitLocation) { _id = id; _name = name; @@ -59,6 +60,7 @@ public class TimedHuntingZoneHolder _instanceId = instanceId; _soloInstance = soloInstance; _weekly = weekly; + _useWorldPrefix = useWorldPrefix; _enterLocation = enterLocation; _exitLocation = exitLocation; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; @@ -135,6 +137,11 @@ public class TimedHuntingZoneHolder return _weekly; } + public boolean useWorldPrefix() + { + return _useWorldPrefix; + } + public Location getEnterLocation() { return _enterLocation; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 349b30652e..64b555536f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -70,7 +70,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket packet.writeC(0); // bCanReEnter packet.writeC(0); // bIsInZonePCCafeUserOnly packet.writeC(0); // bIsPCCafeUser - packet.writeC(0); // bWorldInZone + packet.writeC(holder.useWorldPrefix() ? 1 : 0); // bWorldInZone } return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/TimedHuntingZoneData.xsd b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/TimedHuntingZoneData.xsd index 5e4408d5f8..086251165c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/TimedHuntingZoneData.xsd +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/TimedHuntingZoneData.xsd @@ -19,6 +19,7 @@ + diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java index 971b79ff25..6e6aeba205 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java @@ -90,6 +90,7 @@ public class TimedHuntingZoneData implements IXmlReader int instanceId = 0; boolean soloInstance = true; boolean weekly = false; + boolean useWorldPrefix = false; Location enterLocation = null; Location exitLocation = null; for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) @@ -168,9 +169,14 @@ public class TimedHuntingZoneData implements IXmlReader weekly = Boolean.parseBoolean(zoneNode.getTextContent()); break; } + case "useWorldPrefix": + { + useWorldPrefix = Boolean.parseBoolean(zoneNode.getTextContent()); + break; + } } } - _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, enterLocation, exitLocation)); + _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, useWorldPrefix, enterLocation, exitLocation)); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java index 60dc7be542..7b4f4d1b31 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java @@ -38,12 +38,13 @@ public class TimedHuntingZoneHolder private final int _instanceId; private final boolean _soloInstance; private final boolean _weekly; + private final boolean _useWorldPrefix; private final Location _enterLocation; private final Location _exitLocation; private final int _mapX; private final int _mapY; - public TimedHuntingZoneHolder(int id, String name, int initialTime, int maximumAddedTime, int resetDelay, int entryItemId, int entryFee, int minLevel, int maxLevel, int remainRefillTime, int refillTimeMax, int instanceId, boolean soloInstance, boolean weekly, Location enterLocation, Location exitLocation) + public TimedHuntingZoneHolder(int id, String name, int initialTime, int maximumAddedTime, int resetDelay, int entryItemId, int entryFee, int minLevel, int maxLevel, int remainRefillTime, int refillTimeMax, int instanceId, boolean soloInstance, boolean weekly, boolean useWorldPrefix, Location enterLocation, Location exitLocation) { _id = id; _name = name; @@ -59,6 +60,7 @@ public class TimedHuntingZoneHolder _instanceId = instanceId; _soloInstance = soloInstance; _weekly = weekly; + _useWorldPrefix = useWorldPrefix; _enterLocation = enterLocation; _exitLocation = exitLocation; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; @@ -135,6 +137,11 @@ public class TimedHuntingZoneHolder return _weekly; } + public boolean useWorldPrefix() + { + return _useWorldPrefix; + } + public Location getEnterLocation() { return _enterLocation; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 349b30652e..64b555536f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -70,7 +70,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket packet.writeC(0); // bCanReEnter packet.writeC(0); // bIsInZonePCCafeUserOnly packet.writeC(0); // bIsPCCafeUser - packet.writeC(0); // bWorldInZone + packet.writeC(holder.useWorldPrefix() ? 1 : 0); // bWorldInZone } return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/TimedHuntingZoneData.xsd b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/TimedHuntingZoneData.xsd index 5e4408d5f8..086251165c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/TimedHuntingZoneData.xsd +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/TimedHuntingZoneData.xsd @@ -19,6 +19,7 @@ + diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java index 971b79ff25..6e6aeba205 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java @@ -90,6 +90,7 @@ public class TimedHuntingZoneData implements IXmlReader int instanceId = 0; boolean soloInstance = true; boolean weekly = false; + boolean useWorldPrefix = false; Location enterLocation = null; Location exitLocation = null; for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) @@ -168,9 +169,14 @@ public class TimedHuntingZoneData implements IXmlReader weekly = Boolean.parseBoolean(zoneNode.getTextContent()); break; } + case "useWorldPrefix": + { + useWorldPrefix = Boolean.parseBoolean(zoneNode.getTextContent()); + break; + } } } - _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, enterLocation, exitLocation)); + _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, useWorldPrefix, enterLocation, exitLocation)); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java index 60dc7be542..7b4f4d1b31 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java @@ -38,12 +38,13 @@ public class TimedHuntingZoneHolder private final int _instanceId; private final boolean _soloInstance; private final boolean _weekly; + private final boolean _useWorldPrefix; private final Location _enterLocation; private final Location _exitLocation; private final int _mapX; private final int _mapY; - public TimedHuntingZoneHolder(int id, String name, int initialTime, int maximumAddedTime, int resetDelay, int entryItemId, int entryFee, int minLevel, int maxLevel, int remainRefillTime, int refillTimeMax, int instanceId, boolean soloInstance, boolean weekly, Location enterLocation, Location exitLocation) + public TimedHuntingZoneHolder(int id, String name, int initialTime, int maximumAddedTime, int resetDelay, int entryItemId, int entryFee, int minLevel, int maxLevel, int remainRefillTime, int refillTimeMax, int instanceId, boolean soloInstance, boolean weekly, boolean useWorldPrefix, Location enterLocation, Location exitLocation) { _id = id; _name = name; @@ -59,6 +60,7 @@ public class TimedHuntingZoneHolder _instanceId = instanceId; _soloInstance = soloInstance; _weekly = weekly; + _useWorldPrefix = useWorldPrefix; _enterLocation = enterLocation; _exitLocation = exitLocation; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; @@ -135,6 +137,11 @@ public class TimedHuntingZoneHolder return _weekly; } + public boolean useWorldPrefix() + { + return _useWorldPrefix; + } + public Location getEnterLocation() { return _enterLocation; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 349b30652e..64b555536f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -70,7 +70,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket packet.writeC(0); // bCanReEnter packet.writeC(0); // bIsInZonePCCafeUserOnly packet.writeC(0); // bIsPCCafeUser - packet.writeC(0); // bWorldInZone + packet.writeC(holder.useWorldPrefix() ? 1 : 0); // bWorldInZone } return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/xsd/TimedHuntingZoneData.xsd b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/xsd/TimedHuntingZoneData.xsd index 5e4408d5f8..086251165c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/xsd/TimedHuntingZoneData.xsd +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/xsd/TimedHuntingZoneData.xsd @@ -19,6 +19,7 @@ + diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java index 971b79ff25..6e6aeba205 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java @@ -90,6 +90,7 @@ public class TimedHuntingZoneData implements IXmlReader int instanceId = 0; boolean soloInstance = true; boolean weekly = false; + boolean useWorldPrefix = false; Location enterLocation = null; Location exitLocation = null; for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) @@ -168,9 +169,14 @@ public class TimedHuntingZoneData implements IXmlReader weekly = Boolean.parseBoolean(zoneNode.getTextContent()); break; } + case "useWorldPrefix": + { + useWorldPrefix = Boolean.parseBoolean(zoneNode.getTextContent()); + break; + } } } - _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, enterLocation, exitLocation)); + _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, useWorldPrefix, enterLocation, exitLocation)); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java index 60dc7be542..7b4f4d1b31 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java @@ -38,12 +38,13 @@ public class TimedHuntingZoneHolder private final int _instanceId; private final boolean _soloInstance; private final boolean _weekly; + private final boolean _useWorldPrefix; private final Location _enterLocation; private final Location _exitLocation; private final int _mapX; private final int _mapY; - public TimedHuntingZoneHolder(int id, String name, int initialTime, int maximumAddedTime, int resetDelay, int entryItemId, int entryFee, int minLevel, int maxLevel, int remainRefillTime, int refillTimeMax, int instanceId, boolean soloInstance, boolean weekly, Location enterLocation, Location exitLocation) + public TimedHuntingZoneHolder(int id, String name, int initialTime, int maximumAddedTime, int resetDelay, int entryItemId, int entryFee, int minLevel, int maxLevel, int remainRefillTime, int refillTimeMax, int instanceId, boolean soloInstance, boolean weekly, boolean useWorldPrefix, Location enterLocation, Location exitLocation) { _id = id; _name = name; @@ -59,6 +60,7 @@ public class TimedHuntingZoneHolder _instanceId = instanceId; _soloInstance = soloInstance; _weekly = weekly; + _useWorldPrefix = useWorldPrefix; _enterLocation = enterLocation; _exitLocation = exitLocation; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; @@ -135,6 +137,11 @@ public class TimedHuntingZoneHolder return _weekly; } + public boolean useWorldPrefix() + { + return _useWorldPrefix; + } + public Location getEnterLocation() { return _enterLocation; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 349b30652e..64b555536f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -70,7 +70,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket packet.writeC(0); // bCanReEnter packet.writeC(0); // bIsInZonePCCafeUserOnly packet.writeC(0); // bIsPCCafeUser - packet.writeC(0); // bWorldInZone + packet.writeC(holder.useWorldPrefix() ? 1 : 0); // bWorldInZone } return true; }