2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-04 08:39:05 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Players Online On Website, Changed packaging a little & added SettingsLoader (#44)

Browse Source
This commit is contained in:
Daniel Ginovker
2019-10-09 17:30:43 -04:00
committed by GitHub
parent 1f49bff69d
commit b97a843428
12 changed files with 96 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/Server.java
+13 -10
View File
@@ -8,7 +8,9 @@ import org.apache.mina.common.IoAcceptor;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
import redone.discord.JavaCord;
import redone.integrations.PlayersOnlineWebsite;
import redone.integrations.SettingsLoader;
import redone.integrations.discord.JavaCord;
import redone.event.CycleEventHandler;
import redone.event.TaskScheduler;
import redone.game.content.minigames.FightCaves;
@@ -52,24 +54,24 @@ public class Server {
public static int[] cannonsY = new int [50];
public static String[] cannonsO = new String [50];
public static boolean sleeping;
public static final int cycleRate;
private static final int cycleRate;
public static boolean UpdateServer = false;
public static long lastMassSave = System.currentTimeMillis();
private static IoAcceptor acceptor;
private static ConnectionHandler connectionHandler;
private static ConnectionThrottleFilter throttleFilter;
public static boolean shutdownServer = false;
private static boolean shutdownServer = false;
public static int garbageCollectDelay = 40;
public static boolean shutdownClientHandler;
public static int serverlistenerPort;
private static int serverlistenerPort;
public static ItemHandler itemHandler = new ItemHandler();
public static PlayerHandler playerHandler = new PlayerHandler();
public static NpcHandler npcHandler = new NpcHandler();
public static ShopHandler shopHandler = new ShopHandler();
private static ShopHandler shopHandler = new ShopHandler();
public static ObjectHandler objectHandler = new ObjectHandler();
public static ObjectManager objectManager = new ObjectManager();
public static FightCaves fightCaves = new FightCaves();
public static PestControl pestControl = new PestControl();
private static PestControl pestControl = new PestControl();
public static Trawler trawler = new Trawler();
private static final TaskScheduler scheduler = new TaskScheduler();
public static ClanChatHandler clanChat = new ClanChatHandler();
@@ -82,7 +84,7 @@ public class Server {
* Port and Cycle rate.
*/
static {
serverlistenerPort = 43594;
serverlistenerPort = 43595;
cycleRate = 600;
shutdownServer = false;
}
@@ -113,9 +115,9 @@ public class Server {
System.out.println("Launching " + Constants.SERVER_NAME + "...");
/**
* Start Discord Bot
*/
* Start Integration Services
**/
SettingsLoader.loadSettings();
JavaCord.init();
/**
@@ -168,6 +170,7 @@ public class Server {
FightPits.process();
pestControl.process();
CycleEventHandler.getSingleton().process();
PlayersOnlineWebsite.addUpdatePlayersOnlineTask();
if (System.currentTimeMillis() - lastMassSave > 300000) {
for (Player p : PlayerHandler.players) {
if (p == null) {