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

Renamed method checkInstanceTime to isSoloInstance.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-06-28 23:15:28 +00:00
parent 35632e82a8
commit c9659c5cbe
28 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/TimedHuntingZoneData.xsd vendored
View File

@ -16,7 +16,7 @@
<xs:element type="xs:short" name="minLevel" /> <xs:element type="xs:short" name="minLevel" />
<xs:element type="xs:short" name="maxLevel" /> <xs:element type="xs:short" name="maxLevel" />
<xs:element type="xs:int" name="instanceId" minOccurs="0" /> <xs:element type="xs:int" name="instanceId" minOccurs="0" />
<xs:element type="xs:boolean" name="checkInstanceTime" minOccurs="0" /> <xs:element type="xs:boolean" name="soloInstance" minOccurs="0" />
<xs:element type="xs:boolean" name="weekly" minOccurs="0" /> <xs:element type="xs:boolean" name="weekly" minOccurs="0" />
</xs:sequence> </xs:sequence>
<xs:attribute type="xs:byte" name="id" use="optional" /> <xs:attribute type="xs:byte" name="id" use="optional" />

8
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java
View File

@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader
int remainRefillTime = 3600; int remainRefillTime = 3600;
int refillTimeMax = 3600; int refillTimeMax = 3600;
int instanceId = 0; int instanceId = 0;
boolean checkInstanceTime = true; boolean soloInstance = true;
boolean weekly = false; boolean weekly = false;
Location enterLocation = null; Location enterLocation = null;
for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling())
@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader
instanceId = Integer.parseInt(zoneNode.getTextContent()); instanceId = Integer.parseInt(zoneNode.getTextContent());
break; break;
} }
case "checkInstanceTime": case "soloInstance":
{ {
checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); soloInstance = Boolean.parseBoolean(zoneNode.getTextContent());
break; break;
} }
case "weekly": 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));
} }
} }
} }

10
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java
View File

@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder
private final int _remainRefillTime; private final int _remainRefillTime;
private final int _refillTimeMax; private final int _refillTimeMax;
private final int _instanceId; private final int _instanceId;
private final boolean _checkInstanceTime; private final boolean _soloInstance;
private final boolean _weekly; private final boolean _weekly;
private final Location _enterLocation; private final Location _enterLocation;
private final int _mapX; private final int _mapX;
private final int _mapY; 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; _id = id;
_name = name; _name = name;
@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder
_remainRefillTime = remainRefillTime; _remainRefillTime = remainRefillTime;
_refillTimeMax = refillTimeMax; _refillTimeMax = refillTimeMax;
_instanceId = instanceId; _instanceId = instanceId;
_checkInstanceTime = checkInstanceTime; _soloInstance = soloInstance;
_weekly = weekly; _weekly = weekly;
_enterLocation = enterLocation; _enterLocation = enterLocation;
_mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN;
@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder
return _instanceId; return _instanceId;
} }
public boolean checkInstanceTime() public boolean isSoloInstance()
{ {
return _checkInstanceTime; return _soloInstance;
} }
public boolean isWeekly() public boolean isWeekly()

2
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java
View File

@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
} }
final int instanceId = holder.getInstanceId(); 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."); player.sendMessage("This transcendent instance has not reset yet.");
return; return;

2
L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/TimedHuntingZoneData.xsd vendored
View File

@ -16,7 +16,7 @@
<xs:element type="xs:short" name="minLevel" /> <xs:element type="xs:short" name="minLevel" />
<xs:element type="xs:short" name="maxLevel" /> <xs:element type="xs:short" name="maxLevel" />
<xs:element type="xs:int" name="instanceId" minOccurs="0" /> <xs:element type="xs:int" name="instanceId" minOccurs="0" />
<xs:element type="xs:boolean" name="checkInstanceTime" minOccurs="0" /> <xs:element type="xs:boolean" name="soloInstance" minOccurs="0" />
<xs:element type="xs:boolean" name="weekly" minOccurs="0" /> <xs:element type="xs:boolean" name="weekly" minOccurs="0" />
</xs:sequence> </xs:sequence>
<xs:attribute type="xs:byte" name="id" use="optional" /> <xs:attribute type="xs:byte" name="id" use="optional" />

8
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java
View File

@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader
int remainRefillTime = 3600; int remainRefillTime = 3600;
int refillTimeMax = 3600; int refillTimeMax = 3600;
int instanceId = 0; int instanceId = 0;
boolean checkInstanceTime = true; boolean soloInstance = true;
boolean weekly = false; boolean weekly = false;
Location enterLocation = null; Location enterLocation = null;
for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling())
@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader
instanceId = Integer.parseInt(zoneNode.getTextContent()); instanceId = Integer.parseInt(zoneNode.getTextContent());
break; break;
} }
case "checkInstanceTime": case "soloInstance":
{ {
checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); soloInstance = Boolean.parseBoolean(zoneNode.getTextContent());
break; break;
} }
case "weekly": 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));
} }
} }
} }

10
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java
View File

@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder
private final int _remainRefillTime; private final int _remainRefillTime;
private final int _refillTimeMax; private final int _refillTimeMax;
private final int _instanceId; private final int _instanceId;
private final boolean _checkInstanceTime; private final boolean _soloInstance;
private final boolean _weekly; private final boolean _weekly;
private final Location _enterLocation; private final Location _enterLocation;
private final int _mapX; private final int _mapX;
private final int _mapY; 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; _id = id;
_name = name; _name = name;
@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder
_remainRefillTime = remainRefillTime; _remainRefillTime = remainRefillTime;
_refillTimeMax = refillTimeMax; _refillTimeMax = refillTimeMax;
_instanceId = instanceId; _instanceId = instanceId;
_checkInstanceTime = checkInstanceTime; _soloInstance = soloInstance;
_weekly = weekly; _weekly = weekly;
_enterLocation = enterLocation; _enterLocation = enterLocation;
_mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN;
@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder
return _instanceId; return _instanceId;
} }
public boolean checkInstanceTime() public boolean isSoloInstance()
{ {
return _checkInstanceTime; return _soloInstance;
} }
public boolean isWeekly() public boolean isWeekly()

2
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java
View File

@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
} }
final int instanceId = holder.getInstanceId(); 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."); player.sendMessage("This transcendent instance has not reset yet.");
return; return;

2
L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/xsd/TimedHuntingZoneData.xsd vendored
View File

@ -16,7 +16,7 @@
<xs:element type="xs:short" name="minLevel" /> <xs:element type="xs:short" name="minLevel" />
<xs:element type="xs:short" name="maxLevel" /> <xs:element type="xs:short" name="maxLevel" />
<xs:element type="xs:int" name="instanceId" minOccurs="0" /> <xs:element type="xs:int" name="instanceId" minOccurs="0" />
<xs:element type="xs:boolean" name="checkInstanceTime" minOccurs="0" /> <xs:element type="xs:boolean" name="soloInstance" minOccurs="0" />
<xs:element type="xs:boolean" name="weekly" minOccurs="0" /> <xs:element type="xs:boolean" name="weekly" minOccurs="0" />
</xs:sequence> </xs:sequence>
<xs:attribute type="xs:byte" name="id" use="optional" /> <xs:attribute type="xs:byte" name="id" use="optional" />

8
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java
View File

@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader
int remainRefillTime = 3600; int remainRefillTime = 3600;
int refillTimeMax = 3600; int refillTimeMax = 3600;
int instanceId = 0; int instanceId = 0;
boolean checkInstanceTime = true; boolean soloInstance = true;
boolean weekly = false; boolean weekly = false;
Location enterLocation = null; Location enterLocation = null;
for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling())
@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader
instanceId = Integer.parseInt(zoneNode.getTextContent()); instanceId = Integer.parseInt(zoneNode.getTextContent());
break; break;
} }
case "checkInstanceTime": case "soloInstance":
{ {
checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); soloInstance = Boolean.parseBoolean(zoneNode.getTextContent());
break; break;
} }
case "weekly": 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));
} }
} }
} }

10
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java
View File

@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder
private final int _remainRefillTime; private final int _remainRefillTime;
private final int _refillTimeMax; private final int _refillTimeMax;
private final int _instanceId; private final int _instanceId;
private final boolean _checkInstanceTime; private final boolean _soloInstance;
private final boolean _weekly; private final boolean _weekly;
private final Location _enterLocation; private final Location _enterLocation;
private final int _mapX; private final int _mapX;
private final int _mapY; 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; _id = id;
_name = name; _name = name;
@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder
_remainRefillTime = remainRefillTime; _remainRefillTime = remainRefillTime;
_refillTimeMax = refillTimeMax; _refillTimeMax = refillTimeMax;
_instanceId = instanceId; _instanceId = instanceId;
_checkInstanceTime = checkInstanceTime; _soloInstance = soloInstance;
_weekly = weekly; _weekly = weekly;
_enterLocation = enterLocation; _enterLocation = enterLocation;
_mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN;
@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder
return _instanceId; return _instanceId;
} }
public boolean checkInstanceTime() public boolean isSoloInstance()
{ {
return _checkInstanceTime; return _soloInstance;
} }
public boolean isWeekly() public boolean isWeekly()

2
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java
View File

@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
} }
final int instanceId = holder.getInstanceId(); 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."); player.sendMessage("This transcendent instance has not reset yet.");
return; return;

2
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/TimedHuntingZoneData.xsd vendored
View File

@ -16,7 +16,7 @@
<xs:element type="xs:short" name="minLevel" /> <xs:element type="xs:short" name="minLevel" />
<xs:element type="xs:short" name="maxLevel" /> <xs:element type="xs:short" name="maxLevel" />
<xs:element type="xs:int" name="instanceId" minOccurs="0" /> <xs:element type="xs:int" name="instanceId" minOccurs="0" />
<xs:element type="xs:boolean" name="checkInstanceTime" minOccurs="0" /> <xs:element type="xs:boolean" name="soloInstance" minOccurs="0" />
<xs:element type="xs:boolean" name="weekly" minOccurs="0" /> <xs:element type="xs:boolean" name="weekly" minOccurs="0" />
</xs:sequence> </xs:sequence>
<xs:attribute type="xs:byte" name="id" use="optional" /> <xs:attribute type="xs:byte" name="id" use="optional" />

8
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java
View File

@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader
int remainRefillTime = 3600; int remainRefillTime = 3600;
int refillTimeMax = 3600; int refillTimeMax = 3600;
int instanceId = 0; int instanceId = 0;
boolean checkInstanceTime = true; boolean soloInstance = true;
boolean weekly = false; boolean weekly = false;
Location enterLocation = null; Location enterLocation = null;
for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling())
@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader
instanceId = Integer.parseInt(zoneNode.getTextContent()); instanceId = Integer.parseInt(zoneNode.getTextContent());
break; break;
} }
case "checkInstanceTime": case "soloInstance":
{ {
checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); soloInstance = Boolean.parseBoolean(zoneNode.getTextContent());
break; break;
} }
case "weekly": 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));
} }
} }
} }

10
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java
View File

@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder
private final int _remainRefillTime; private final int _remainRefillTime;
private final int _refillTimeMax; private final int _refillTimeMax;
private final int _instanceId; private final int _instanceId;
private final boolean _checkInstanceTime; private final boolean _soloInstance;
private final boolean _weekly; private final boolean _weekly;
private final Location _enterLocation; private final Location _enterLocation;
private final int _mapX; private final int _mapX;
private final int _mapY; 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; _id = id;
_name = name; _name = name;
@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder
_remainRefillTime = remainRefillTime; _remainRefillTime = remainRefillTime;
_refillTimeMax = refillTimeMax; _refillTimeMax = refillTimeMax;
_instanceId = instanceId; _instanceId = instanceId;
_checkInstanceTime = checkInstanceTime; _soloInstance = soloInstance;
_weekly = weekly; _weekly = weekly;
_enterLocation = enterLocation; _enterLocation = enterLocation;
_mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN;
@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder
return _instanceId; return _instanceId;
} }
public boolean checkInstanceTime() public boolean isSoloInstance()
{ {
return _checkInstanceTime; return _soloInstance;
} }
public boolean isWeekly() public boolean isWeekly()

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java
View File

@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
} }
final int instanceId = holder.getInstanceId(); 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."); player.sendMessage("This transcendent instance has not reset yet.");
return; return;

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/xsd/TimedHuntingZoneData.xsd vendored
View File

@ -16,7 +16,7 @@
<xs:element type="xs:short" name="minLevel" /> <xs:element type="xs:short" name="minLevel" />
<xs:element type="xs:short" name="maxLevel" /> <xs:element type="xs:short" name="maxLevel" />
<xs:element type="xs:int" name="instanceId" minOccurs="0" /> <xs:element type="xs:int" name="instanceId" minOccurs="0" />
<xs:element type="xs:boolean" name="checkInstanceTime" minOccurs="0" /> <xs:element type="xs:boolean" name="soloInstance" minOccurs="0" />
<xs:element type="xs:boolean" name="weekly" minOccurs="0" /> <xs:element type="xs:boolean" name="weekly" minOccurs="0" />
</xs:sequence> </xs:sequence>
<xs:attribute type="xs:byte" name="id" use="optional" /> <xs:attribute type="xs:byte" name="id" use="optional" />

8
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java
View File

@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader
int remainRefillTime = 3600; int remainRefillTime = 3600;
int refillTimeMax = 3600; int refillTimeMax = 3600;
int instanceId = 0; int instanceId = 0;
boolean checkInstanceTime = true; boolean soloInstance = true;
boolean weekly = false; boolean weekly = false;
Location enterLocation = null; Location enterLocation = null;
for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling())
@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader
instanceId = Integer.parseInt(zoneNode.getTextContent()); instanceId = Integer.parseInt(zoneNode.getTextContent());
break; break;
} }
case "checkInstanceTime": case "soloInstance":
{ {
checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); soloInstance = Boolean.parseBoolean(zoneNode.getTextContent());
break; break;
} }
case "weekly": 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));
} }
} }
} }

10
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java
View File

@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder
private final int _remainRefillTime; private final int _remainRefillTime;
private final int _refillTimeMax; private final int _refillTimeMax;
private final int _instanceId; private final int _instanceId;
private final boolean _checkInstanceTime; private final boolean _soloInstance;
private final boolean _weekly; private final boolean _weekly;
private final Location _enterLocation; private final Location _enterLocation;
private final int _mapX; private final int _mapX;
private final int _mapY; 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; _id = id;
_name = name; _name = name;
@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder
_remainRefillTime = remainRefillTime; _remainRefillTime = remainRefillTime;
_refillTimeMax = refillTimeMax; _refillTimeMax = refillTimeMax;
_instanceId = instanceId; _instanceId = instanceId;
_checkInstanceTime = checkInstanceTime; _soloInstance = soloInstance;
_weekly = weekly; _weekly = weekly;
_enterLocation = enterLocation; _enterLocation = enterLocation;
_mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN;
@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder
return _instanceId; return _instanceId;
} }
public boolean checkInstanceTime() public boolean isSoloInstance()
{ {
return _checkInstanceTime; return _soloInstance;
} }
public boolean isWeekly() public boolean isWeekly()

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java
View File

@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
} }
final int instanceId = holder.getInstanceId(); 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."); player.sendMessage("This transcendent instance has not reset yet.");
return; return;

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/xsd/TimedHuntingZoneData.xsd vendored
View File

@ -16,7 +16,7 @@
<xs:element type="xs:short" name="minLevel" /> <xs:element type="xs:short" name="minLevel" />
<xs:element type="xs:short" name="maxLevel" /> <xs:element type="xs:short" name="maxLevel" />
<xs:element type="xs:int" name="instanceId" minOccurs="0" /> <xs:element type="xs:int" name="instanceId" minOccurs="0" />
<xs:element type="xs:boolean" name="checkInstanceTime" minOccurs="0" /> <xs:element type="xs:boolean" name="soloInstance" minOccurs="0" />
<xs:element type="xs:boolean" name="weekly" minOccurs="0" /> <xs:element type="xs:boolean" name="weekly" minOccurs="0" />
</xs:sequence> </xs:sequence>
<xs:attribute type="xs:byte" name="id" use="optional" /> <xs:attribute type="xs:byte" name="id" use="optional" />

8
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java
View File

@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader
int remainRefillTime = 3600; int remainRefillTime = 3600;
int refillTimeMax = 3600; int refillTimeMax = 3600;
int instanceId = 0; int instanceId = 0;
boolean checkInstanceTime = true; boolean soloInstance = true;
boolean weekly = false; boolean weekly = false;
Location enterLocation = null; Location enterLocation = null;
for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling())
@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader
instanceId = Integer.parseInt(zoneNode.getTextContent()); instanceId = Integer.parseInt(zoneNode.getTextContent());
break; break;
} }
case "checkInstanceTime": case "soloInstance":
{ {
checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); soloInstance = Boolean.parseBoolean(zoneNode.getTextContent());
break; break;
} }
case "weekly": 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));
} }
} }
} }

10
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java
View File

@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder
private final int _remainRefillTime; private final int _remainRefillTime;
private final int _refillTimeMax; private final int _refillTimeMax;
private final int _instanceId; private final int _instanceId;
private final boolean _checkInstanceTime; private final boolean _soloInstance;
private final boolean _weekly; private final boolean _weekly;
private final Location _enterLocation; private final Location _enterLocation;
private final int _mapX; private final int _mapX;
private final int _mapY; 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; _id = id;
_name = name; _name = name;
@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder
_remainRefillTime = remainRefillTime; _remainRefillTime = remainRefillTime;
_refillTimeMax = refillTimeMax; _refillTimeMax = refillTimeMax;
_instanceId = instanceId; _instanceId = instanceId;
_checkInstanceTime = checkInstanceTime; _soloInstance = soloInstance;
_weekly = weekly; _weekly = weekly;
_enterLocation = enterLocation; _enterLocation = enterLocation;
_mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN;
@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder
return _instanceId; return _instanceId;
} }
public boolean checkInstanceTime() public boolean isSoloInstance()
{ {
return _checkInstanceTime; return _soloInstance;
} }
public boolean isWeekly() public boolean isWeekly()

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java
View File

@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
} }
final int instanceId = holder.getInstanceId(); 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."); player.sendMessage("This transcendent instance has not reset yet.");
return; return;

2
L2J_Mobius_Essence_5.5_FrostLord/dist/game/data/xsd/TimedHuntingZoneData.xsd vendored
View File

@ -16,7 +16,7 @@
<xs:element type="xs:short" name="minLevel" /> <xs:element type="xs:short" name="minLevel" />
<xs:element type="xs:short" name="maxLevel" /> <xs:element type="xs:short" name="maxLevel" />
<xs:element type="xs:int" name="instanceId" minOccurs="0" /> <xs:element type="xs:int" name="instanceId" minOccurs="0" />
<xs:element type="xs:boolean" name="checkInstanceTime" minOccurs="0" /> <xs:element type="xs:boolean" name="soloInstance" minOccurs="0" />
<xs:element type="xs:boolean" name="weekly" minOccurs="0" /> <xs:element type="xs:boolean" name="weekly" minOccurs="0" />
</xs:sequence> </xs:sequence>
<xs:attribute type="xs:byte" name="id" use="optional" /> <xs:attribute type="xs:byte" name="id" use="optional" />

8
L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/data/xml/TimedHuntingZoneData.java
View File

@ -88,7 +88,7 @@ public class TimedHuntingZoneData implements IXmlReader
int remainRefillTime = 3600; int remainRefillTime = 3600;
int refillTimeMax = 3600; int refillTimeMax = 3600;
int instanceId = 0; int instanceId = 0;
boolean checkInstanceTime = true; boolean soloInstance = true;
boolean weekly = false; boolean weekly = false;
Location enterLocation = null; Location enterLocation = null;
for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling()) for (Node zoneNode = listNode.getFirstChild(); zoneNode != null; zoneNode = zoneNode.getNextSibling())
@ -151,9 +151,9 @@ public class TimedHuntingZoneData implements IXmlReader
instanceId = Integer.parseInt(zoneNode.getTextContent()); instanceId = Integer.parseInt(zoneNode.getTextContent());
break; break;
} }
case "checkInstanceTime": case "soloInstance":
{ {
checkInstanceTime = Boolean.parseBoolean(zoneNode.getTextContent()); soloInstance = Boolean.parseBoolean(zoneNode.getTextContent());
break; break;
} }
case "weekly": 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));
} }
} }
} }

10
L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/holders/TimedHuntingZoneHolder.java
View File

@ -36,13 +36,13 @@ public class TimedHuntingZoneHolder
private final int _remainRefillTime; private final int _remainRefillTime;
private final int _refillTimeMax; private final int _refillTimeMax;
private final int _instanceId; private final int _instanceId;
private final boolean _checkInstanceTime; private final boolean _soloInstance;
private final boolean _weekly; private final boolean _weekly;
private final Location _enterLocation; private final Location _enterLocation;
private final int _mapX; private final int _mapX;
private final int _mapY; 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; _id = id;
_name = name; _name = name;
@ -56,7 +56,7 @@ public class TimedHuntingZoneHolder
_remainRefillTime = remainRefillTime; _remainRefillTime = remainRefillTime;
_refillTimeMax = refillTimeMax; _refillTimeMax = refillTimeMax;
_instanceId = instanceId; _instanceId = instanceId;
_checkInstanceTime = checkInstanceTime; _soloInstance = soloInstance;
_weekly = weekly; _weekly = weekly;
_enterLocation = enterLocation; _enterLocation = enterLocation;
_mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN; _mapX = ((_enterLocation.getX() - World.WORLD_X_MIN) >> 15) + World.TILE_X_MIN;
@ -123,9 +123,9 @@ public class TimedHuntingZoneHolder
return _instanceId; return _instanceId;
} }
public boolean checkInstanceTime() public boolean isSoloInstance()
{ {
return _checkInstanceTime; return _soloInstance;
} }
public boolean isWeekly() public boolean isWeekly()

2
L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java
View File

@ -102,7 +102,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
} }
final int instanceId = holder.getInstanceId(); 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."); player.sendMessage("This transcendent instance has not reset yet.");
return; return;