Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

refactor eventticks

Browse source
This commit is contained in:
RedSparr0w 2019-09-22 15:22:54 +12:00
parent 10c3c3da78
commit 8f176e1944
1 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
09HDscape-server/src/org/crandor/game/world/GameWorld.java
View file

@ -135,10 +135,9 @@ public final class GameWorld {
pulses.clear();
ticks++;
eventTicks++;
int idx = new Random().nextInt(hourlyEvent.length);
String random = hourlyEvent[idx];
switch(cfTicks++) {
case 50:
cfTicks++;
switch(cfTicks) {
case 100:
if (checkDay()) {
GlobalEventManager.get().activate("Clone Fest", null);
if (GlobalEventManager.get().isActive("Clone Fest")) {
@ -163,34 +162,28 @@ public final class GameWorld {
}
}
break;
case 1000:
case 1100:
if (PVPAIPActions.pvp_players == null) {
GlobalEventManager.get().deactivate("Clone Fest");
}
break;
case 1500:
if (PVPAIPActions.pvp_players == null) {
GlobalEventManager.get().deactivate("Clone Fest");
}
GlobalEventManager.get().deactivate("Clone Fest");
break;
case 1900:
cfTicks = 0;
break;
}
switch (eventTicks) {
case 100:
if (GlobalEventManager.get().getLastEvent() == random) {
random = (hourlyEvent[idx]);
}
String event = random;
// 2 minute gap between events
case 200:
int randomEventId = new Random().nextInt(hourlyEvent.length);
String event = hourlyEvent[randomEventId];
GlobalEventManager.get().setLastEvent(event);
GlobalEventManager.get().setCurrentEvent(event);
GlobalEventManager.get().activateHourly(event);
break;
case 6100:
GlobalEventManager.get().deactivate(GlobalEventManager.get().getCurrentEvent());
break;
case 6200:
eventTicks = 0;
break;