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

Region factory (#404)

Browse Source 
* Split region loading and object population to factory class

* Implement changes, disable CommandConsole

* You guys don't omit /build/
This commit is contained in:
Damion
2020-06-17 11:43:41 +10:00
committed by GitHub
parent 5725a64abc
commit 6085111d7c
3 changed files with 303 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/main/java/com/rebotted/GameEngine.java
+7 -4
View File
@@ -16,7 +16,6 @@ import java.util.concurrent.locks.ReentrantLock;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
import com.rebotted.console.CommandConsole;
import com.rebotted.event.CycleEventHandler;
import com.rebotted.game.content.minigames.FightCaves;
import com.rebotted.game.content.minigames.FightPits;
@@ -47,7 +46,7 @@ import com.rebotted.world.ItemHandler;
import com.rebotted.world.ObjectHandler;
import com.rebotted.world.ObjectManager;
import com.rebotted.world.clip.ObjectDefinition;
import com.rebotted.world.clip.Region;
import com.rebotted.world.clip.RegionFactory;
/**
* Server.java
@@ -189,7 +188,7 @@ public class GameEngine {
* Initialise Handlers
*/
ObjectDefinition.loadConfig();
Region.load();
RegionFactory.load();
Doors.getSingleton().load();
DoubleDoors.getSingleton().load();
ItemDefinition.read();
@@ -265,7 +264,11 @@ public class GameEngine {
}
}, 0, GameConstants.CYCLE_TIME, TimeUnit.MILLISECONDS);
CommandConsole.getInstance();
/*
* I'd recommend disabling this until I can be bothered to implement it
* properly.
*/
// CommandConsole.getInstance();
try {
while (!scheduler.awaitTermination(60, TimeUnit.SECONDS)) {