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

Store olympiad stadium id.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-04-20 23:17:09 +00:00
parent 4880381383
commit 90e0eb7a94
19 changed files with 190 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

15
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

15
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

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

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

15
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }

15
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
View File

@ -43,14 +43,17 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class OlympiadStadium public class OlympiadStadium
{ {
private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName()); private static final Logger LOGGER = Logger.getLogger(OlympiadStadium.class.getName());
private final OlympiadStadiumZone _zone; private final OlympiadStadiumZone _zone;
private final int _stadiumId;
private final Instance _instance; private final Instance _instance;
private final List<Spawn> _buffers; private final List<Spawn> _buffers;
private OlympiadGameTask _task = null; private OlympiadGameTask _task = null;
protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadium) protected OlympiadStadium(OlympiadStadiumZone olyzone, int stadiumId)
{ {
_zone = olyzone; _zone = olyzone;
_stadiumId = stadiumId;
_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::deleteMe); _buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
@ -177,15 +180,17 @@ public class OlympiadStadium
return; return;
} }
final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId()); final List<Location> spectatorSpawns = getZone().getSpectatorSpawns();
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty()) if (spectatorSpawns.isEmpty())
{ {
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); LOGGER.warning(getClass().getSimpleName() + ": Zone: " + getZone() + " doesn't have specatator spawns defined!");
return; return;
} }
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
player.enterOlympiadObserverMode(loc, player.getOlympiadGameId()); player.enterOlympiadObserverMode(loc, _stadiumId);
_task.getGame().sendOlympiadInfo(player);
} }
} }
} }