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

Fixed olympiad announcer when server restarts during competition period.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment 2019-10-20 11:00:50 +00:00
parent 8db02dbcb4
commit 50fb91d327
16 changed files with 32 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -77,7 +70,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)

11
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.model.olympiad;
import java.util.Set;
import org.l2jmobius.gameserver.datatables.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Spawn;
@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
public class OlympiadAnnouncer implements Runnable
{
private static final int OLY_MANAGER = 31688;
private final Set<Spawn> _managers;
private int _currentStadium = 0;
public OlympiadAnnouncer()
{
_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
}
private int _currentStadium = 0;
@Override
public void run()
@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
}
}
for (Spawn spawn : _managers)
for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
{
final Npc manager = spawn.getLastSpawn();
if (manager != null)