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

Fixed olympiad buffers respawning occasionally.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2020-07-03 22:22:59 +00:00
parent b6aa52c4d4
commit 4d08c902de
15 changed files with 30 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }

6
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@@ -53,7 +53,7 @@ public class OlympiadStadium
_zone = olyzone; _zone = olyzone;
_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null); _instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList()); _buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
} }
public OlympiadStadiumZone getZone() public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
public void spawnBuffers() public void spawnBuffers()
{ {
_buffers.forEach(Spawn::startRespawn); _buffers.forEach(spawn -> spawn.doSpawn(false));
_buffers.forEach(Spawn::doSpawn);
} }
public void deleteBuffers() public void deleteBuffers()
{ {
_buffers.forEach(Spawn::stopRespawn);
_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
} }