From c9659c5cbe6e9d7c3fdb7fdf902b05d1734af2a4 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 28 Jun 2021 23:15:28 +0000 Subject: [PATCH] Renamed method checkInstanceTime to isSoloInstance. --- .../dist/game/data/xsd/TimedHuntingZoneData.xsd | 2 +- .../gameserver/data/xml/TimedHuntingZoneData.java | 8 ++++---- .../model/holders/TimedHuntingZoneHolder.java | 10 +++++----- .../huntingzones/ExTimedHuntingZoneEnter.java | 2 +- .../dist/game/data/xsd/TimedHuntingZoneData.xsd | 2 +- .../gameserver/data/xml/TimedHuntingZoneData.java | 8 ++++---- .../model/holders/TimedHuntingZoneHolder.java | 10 +++++----- .../huntingzones/ExTimedHuntingZoneEnter.java | 2 +- .../dist/game/data/xsd/TimedHuntingZoneData.xsd | 2 +- .../gameserver/data/xml/TimedHuntingZoneData.java | 8 ++++---- .../model/holders/TimedHuntingZoneHolder.java | 10 +++++----- .../huntingzones/ExTimedHuntingZoneEnter.java | 2 +- .../dist/game/data/xsd/TimedHuntingZoneData.xsd | 2 +- .../gameserver/data/xml/TimedHuntingZoneData.java | 8 ++++---- .../model/holders/TimedHuntingZoneHolder.java | 10 +++++----- .../huntingzones/ExTimedHuntingZoneEnter.java | 2 +- .../dist/game/data/xsd/TimedHuntingZoneData.xsd | 2 +- .../gameserver/data/xml/TimedHuntingZoneData.java | 8 ++++---- .../model/holders/TimedHuntingZoneHolder.java | 10 +++++----- .../huntingzones/ExTimedHuntingZoneEnter.java | 2 +- .../dist/game/data/xsd/TimedHuntingZoneData.xsd | 2 +- .../gameserver/data/xml/TimedHuntingZoneData.java | 8 ++++---- .../model/holders/TimedHuntingZoneHolder.java | 10 +++++----- .../huntingzones/ExTimedHuntingZoneEnter.java | 2 +- .../dist/game/data/xsd/TimedHuntingZoneData.xsd | 2 +- .../gameserver/data/xml/TimedHuntingZoneData.java | 8 ++++---- .../model/holders/TimedHuntingZoneHolder.java | 10 +++++----- .../huntingzones/ExTimedHuntingZoneEnter.java | 2 +- 28 files changed, 77 insertions(+), 77 deletions(-) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/TimedHuntingZoneData.xsd b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/TimedHuntingZoneData.xsd index c5e156dddc..cdd1c77656 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/TimedHuntingZoneData.xsd +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/TimedHuntingZoneData.xsd @@ -16,7 +16,7 @@ - + diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java index 9786b60219..95b173e730 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java @@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader int remainRefillTime = 3600; int refillTimeMax = 3600; int instanceId = 0; - boolean checkInstanceTime = true; + boolean soloInstance = true; boolean weekly = false; Location enterLocation = null; for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) @@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader instanceId = Integer.parseInt(zoneNode.getTextContent()); break; } - case "checkInstanceTime": + case "soloInstance": { - checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); + soloInstance = Boolean.parseBoolean(zoneNode.getTextContent()); break; } case "weekly": @@ -163,7 +163,7 @@ public class TimedHuntingZoneData implements IXmlReader } } } - _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, checkInstanceTime, weekly, enterLocation)); + _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, enterLocation)); } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java index a32fa35710..32302e09dc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java @@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder private final int _remainRefillTime; private final int _refillTimeMax; private final int _instanceId; - private final boolean _checkInstanceTime; + private final boolean _soloInstance; private final boolean _weekly; private final Location _enterLocation; 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 checkInstanceTime, boolean weekly, Location enterLocation) + 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) { _id = id; _name = name; @@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder _remainRefillTime = remainRefillTime; _refillTimeMax = refillTimeMax; _instanceId = instanceId; - _checkInstanceTime = checkInstanceTime; + _soloInstance = soloInstance; _weekly = weekly; _enterLocation = enterLocation; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; @@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder return _instanceId; } - public boolean checkInstanceTime() + public boolean isSoloInstance() { - return _checkInstanceTime; + return _soloInstance; } public boolean isWeekly() diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 3d68d771ce..a6e789f3af 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket } final int instanceId = holder.getInstanceId(); - if ((instanceId > 0) && holder.checkInstanceTime() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) + if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) { player.sendMessage("This transcendent instance has not reset yet."); return; diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/TimedHuntingZoneData.xsd b/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/TimedHuntingZoneData.xsd index c5e156dddc..cdd1c77656 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/TimedHuntingZoneData.xsd +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/TimedHuntingZoneData.xsd @@ -16,7 +16,7 @@ - + diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java index 9786b60219..95b173e730 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java @@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader int remainRefillTime = 3600; int refillTimeMax = 3600; int instanceId = 0; - boolean checkInstanceTime = true; + boolean soloInstance = true; boolean weekly = false; Location enterLocation = null; for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) @@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader instanceId = Integer.parseInt(zoneNode.getTextContent()); break; } - case "checkInstanceTime": + case "soloInstance": { - checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); + soloInstance = Boolean.parseBoolean(zoneNode.getTextContent()); break; } case "weekly": @@ -163,7 +163,7 @@ public class TimedHuntingZoneData implements IXmlReader } } } - _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, checkInstanceTime, weekly, enterLocation)); + _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, enterLocation)); } } } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java index a32fa35710..32302e09dc 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java @@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder private final int _remainRefillTime; private final int _refillTimeMax; private final int _instanceId; - private final boolean _checkInstanceTime; + private final boolean _soloInstance; private final boolean _weekly; private final Location _enterLocation; 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 checkInstanceTime, boolean weekly, Location enterLocation) + 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) { _id = id; _name = name; @@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder _remainRefillTime = remainRefillTime; _refillTimeMax = refillTimeMax; _instanceId = instanceId; - _checkInstanceTime = checkInstanceTime; + _soloInstance = soloInstance; _weekly = weekly; _enterLocation = enterLocation; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; @@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder return _instanceId; } - public boolean checkInstanceTime() + public boolean isSoloInstance() { - return _checkInstanceTime; + return _soloInstance; } public boolean isWeekly() diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 3d68d771ce..a6e789f3af 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket } final int instanceId = holder.getInstanceId(); - if ((instanceId > 0) && holder.checkInstanceTime() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) + if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) { player.sendMessage("This transcendent instance has not reset yet."); return; diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/xsd/TimedHuntingZoneData.xsd b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/xsd/TimedHuntingZoneData.xsd index c5e156dddc..cdd1c77656 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/xsd/TimedHuntingZoneData.xsd +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/xsd/TimedHuntingZoneData.xsd @@ -16,7 +16,7 @@ - + diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java index 9786b60219..95b173e730 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java @@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader int remainRefillTime = 3600; int refillTimeMax = 3600; int instanceId = 0; - boolean checkInstanceTime = true; + boolean soloInstance = true; boolean weekly = false; Location enterLocation = null; for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) @@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader instanceId = Integer.parseInt(zoneNode.getTextContent()); break; } - case "checkInstanceTime": + case "soloInstance": { - checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); + soloInstance = Boolean.parseBoolean(zoneNode.getTextContent()); break; } case "weekly": @@ -163,7 +163,7 @@ public class TimedHuntingZoneData implements IXmlReader } } } - _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, checkInstanceTime, weekly, enterLocation)); + _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, enterLocation)); } } } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java index a32fa35710..32302e09dc 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java @@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder private final int _remainRefillTime; private final int _refillTimeMax; private final int _instanceId; - private final boolean _checkInstanceTime; + private final boolean _soloInstance; private final boolean _weekly; private final Location _enterLocation; 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 checkInstanceTime, boolean weekly, Location enterLocation) + 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) { _id = id; _name = name; @@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder _remainRefillTime = remainRefillTime; _refillTimeMax = refillTimeMax; _instanceId = instanceId; - _checkInstanceTime = checkInstanceTime; + _soloInstance = soloInstance; _weekly = weekly; _enterLocation = enterLocation; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; @@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder return _instanceId; } - public boolean checkInstanceTime() + public boolean isSoloInstance() { - return _checkInstanceTime; + return _soloInstance; } public boolean isWeekly() diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 3d68d771ce..a6e789f3af 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket } final int instanceId = holder.getInstanceId(); - if ((instanceId > 0) && holder.checkInstanceTime() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) + if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) { player.sendMessage("This transcendent instance has not reset yet."); return; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/TimedHuntingZoneData.xsd b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/TimedHuntingZoneData.xsd index c5e156dddc..cdd1c77656 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/TimedHuntingZoneData.xsd +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/TimedHuntingZoneData.xsd @@ -16,7 +16,7 @@ - + diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java index 01c84fe7fb..5a6a640763 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java @@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader int remainRefillTime = 3600; int refillTimeMax = 3600; int instanceId = 0; - boolean checkInstanceTime = true; + boolean soloInstance = true; boolean weekly = false; Location enterLocation = null; for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) @@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader instanceId = Integer.parseInt(zoneNode.getTextContent()); break; } - case "checkInstanceTime": + case "soloInstance": { - checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); + soloInstance = Boolean.parseBoolean(zoneNode.getTextContent()); break; } case "weekly": @@ -163,7 +163,7 @@ public class TimedHuntingZoneData implements IXmlReader } } } - _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, checkInstanceTime, weekly, enterLocation)); + _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, enterLocation)); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java index a32fa35710..32302e09dc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java @@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder private final int _remainRefillTime; private final int _refillTimeMax; private final int _instanceId; - private final boolean _checkInstanceTime; + private final boolean _soloInstance; private final boolean _weekly; private final Location _enterLocation; 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 checkInstanceTime, boolean weekly, Location enterLocation) + 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) { _id = id; _name = name; @@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder _remainRefillTime = remainRefillTime; _refillTimeMax = refillTimeMax; _instanceId = instanceId; - _checkInstanceTime = checkInstanceTime; + _soloInstance = soloInstance; _weekly = weekly; _enterLocation = enterLocation; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; @@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder return _instanceId; } - public boolean checkInstanceTime() + public boolean isSoloInstance() { - return _checkInstanceTime; + return _soloInstance; } public boolean isWeekly() diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 3d8b6c3663..2786010f14 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket } final int instanceId = holder.getInstanceId(); - if ((instanceId > 0) && holder.checkInstanceTime() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) + if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) { player.sendMessage("This transcendent instance has not reset yet."); return; diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/xsd/TimedHuntingZoneData.xsd b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/xsd/TimedHuntingZoneData.xsd index c5e156dddc..cdd1c77656 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/xsd/TimedHuntingZoneData.xsd +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/xsd/TimedHuntingZoneData.xsd @@ -16,7 +16,7 @@ - + diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java index 01c84fe7fb..5a6a640763 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java @@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader int remainRefillTime = 3600; int refillTimeMax = 3600; int instanceId = 0; - boolean checkInstanceTime = true; + boolean soloInstance = true; boolean weekly = false; Location enterLocation = null; for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) @@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader instanceId = Integer.parseInt(zoneNode.getTextContent()); break; } - case "checkInstanceTime": + case "soloInstance": { - checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); + soloInstance = Boolean.parseBoolean(zoneNode.getTextContent()); break; } case "weekly": @@ -163,7 +163,7 @@ public class TimedHuntingZoneData implements IXmlReader } } } - _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, checkInstanceTime, weekly, enterLocation)); + _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, enterLocation)); } } } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java index a32fa35710..32302e09dc 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java @@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder private final int _remainRefillTime; private final int _refillTimeMax; private final int _instanceId; - private final boolean _checkInstanceTime; + private final boolean _soloInstance; private final boolean _weekly; private final Location _enterLocation; 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 checkInstanceTime, boolean weekly, Location enterLocation) + 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) { _id = id; _name = name; @@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder _remainRefillTime = remainRefillTime; _refillTimeMax = refillTimeMax; _instanceId = instanceId; - _checkInstanceTime = checkInstanceTime; + _soloInstance = soloInstance; _weekly = weekly; _enterLocation = enterLocation; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; @@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder return _instanceId; } - public boolean checkInstanceTime() + public boolean isSoloInstance() { - return _checkInstanceTime; + return _soloInstance; } public boolean isWeekly() diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 3d8b6c3663..2786010f14 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket } final int instanceId = holder.getInstanceId(); - if ((instanceId > 0) && holder.checkInstanceTime() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) + if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) { player.sendMessage("This transcendent instance has not reset yet."); return; diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/xsd/TimedHuntingZoneData.xsd b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/xsd/TimedHuntingZoneData.xsd index c5e156dddc..cdd1c77656 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/xsd/TimedHuntingZoneData.xsd +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/xsd/TimedHuntingZoneData.xsd @@ -16,7 +16,7 @@ - + diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java index 01c84fe7fb..5a6a640763 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java @@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader int remainRefillTime = 3600; int refillTimeMax = 3600; int instanceId = 0; - boolean checkInstanceTime = true; + boolean soloInstance = true; boolean weekly = false; Location enterLocation = null; for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) @@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader instanceId = Integer.parseInt(zoneNode.getTextContent()); break; } - case "checkInstanceTime": + case "soloInstance": { - checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); + soloInstance = Boolean.parseBoolean(zoneNode.getTextContent()); break; } case "weekly": @@ -163,7 +163,7 @@ public class TimedHuntingZoneData implements IXmlReader } } } - _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, checkInstanceTime, weekly, enterLocation)); + _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, enterLocation)); } } } diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java index a32fa35710..32302e09dc 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java @@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder private final int _remainRefillTime; private final int _refillTimeMax; private final int _instanceId; - private final boolean _checkInstanceTime; + private final boolean _soloInstance; private final boolean _weekly; private final Location _enterLocation; 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 checkInstanceTime, boolean weekly, Location enterLocation) + 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) { _id = id; _name = name; @@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder _remainRefillTime = remainRefillTime; _refillTimeMax = refillTimeMax; _instanceId = instanceId; - _checkInstanceTime = checkInstanceTime; + _soloInstance = soloInstance; _weekly = weekly; _enterLocation = enterLocation; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; @@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder return _instanceId; } - public boolean checkInstanceTime() + public boolean isSoloInstance() { - return _checkInstanceTime; + return _soloInstance; } public boolean isWeekly() diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 3d8b6c3663..2786010f14 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket } final int instanceId = holder.getInstanceId(); - if ((instanceId > 0) && holder.checkInstanceTime() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) + if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) { player.sendMessage("This transcendent instance has not reset yet."); return; diff --git a/L2J_Mobius_Essence_5.5_FrostLord/dist/game/data/xsd/TimedHuntingZoneData.xsd b/L2J_Mobius_Essence_5.5_FrostLord/dist/game/data/xsd/TimedHuntingZoneData.xsd index c5e156dddc..cdd1c77656 100644 --- a/L2J_Mobius_Essence_5.5_FrostLord/dist/game/data/xsd/TimedHuntingZoneData.xsd +++ b/L2J_Mobius_Essence_5.5_FrostLord/dist/game/data/xsd/TimedHuntingZoneData.xsd @@ -16,7 +16,7 @@ - + diff --git a/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java b/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java index 01c84fe7fb..5a6a640763 100644 --- a/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java +++ b/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java @@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader int remainRefillTime = 3600; int refillTimeMax = 3600; int instanceId = 0; - boolean checkInstanceTime = true; + boolean soloInstance = true; boolean weekly = false; Location enterLocation = null; for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) @@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader instanceId = Integer.parseInt(zoneNode.getTextContent()); break; } - case "checkInstanceTime": + case "soloInstance": { - checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); + soloInstance = Boolean.parseBoolean(zoneNode.getTextContent()); break; } case "weekly": @@ -163,7 +163,7 @@ public class TimedHuntingZoneData implements IXmlReader } } } - _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, checkInstanceTime, weekly, enterLocation)); + _timedHuntingZoneData.put(id, new TimedHuntingZoneHolder(id, name, initialTime, maxAddedTime, resetDelay, entryItemId, entryFee, minLevel, maxLevel, remainRefillTime, refillTimeMax, instanceId, soloInstance, weekly, enterLocation)); } } } diff --git a/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java b/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java index a32fa35710..32302e09dc 100644 --- a/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java +++ b/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java @@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder private final int _remainRefillTime; private final int _refillTimeMax; private final int _instanceId; - private final boolean _checkInstanceTime; + private final boolean _soloInstance; private final boolean _weekly; private final Location _enterLocation; 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 checkInstanceTime, boolean weekly, Location enterLocation) + 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) { _id = id; _name = name; @@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder _remainRefillTime = remainRefillTime; _refillTimeMax = refillTimeMax; _instanceId = instanceId; - _checkInstanceTime = checkInstanceTime; + _soloInstance = soloInstance; _weekly = weekly; _enterLocation = enterLocation; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; @@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder return _instanceId; } - public boolean checkInstanceTime() + public boolean isSoloInstance() { - return _checkInstanceTime; + return _soloInstance; } public boolean isWeekly() diff --git a/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 3d8b6c3663..2786010f14 100644 --- a/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket } final int instanceId = holder.getInstanceId(); - if ((instanceId > 0) && holder.checkInstanceTime() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) + if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) { player.sendMessage("This transcendent instance has not reset yet."); return;