simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-20 02:56:44 +00:00
Code Issues Projects Releases Wiki Activity

Minor refactor

Browse Source
This commit is contained in:
simon 2018-03-11 13:34:10 -04:00
parent cbb07891fc
commit 1d780f7d9b
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Server/src/main/java/net/simon987/server/webserver/MessageEventDispatcher.java → Server/src/main/java/net/simon987/server/webserver/MessageDispatcher.java
View File

@ -9,18 +9,17 @@ import org.json.simple.parser.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
public class MessageEventDispatcher { public class MessageDispatcher {
private ArrayList<MessageHandler> handlers = new ArrayList<>(10); private ArrayList<MessageHandler> handlers = new ArrayList<>(10);
public MessageEventDispatcher() { public MessageDispatcher() {
} }
public void addHandler(MessageHandler handler) { public void addHandler(MessageHandler handler) {
handlers.add(handler); handlers.add(handler);
} }
public void dispatch(OnlineUser user, String message) { public void dispatch(OnlineUser user, String message) {

20
Server/src/main/java/net/simon987/server/webserver/SocketServer.java
View File

@ -42,7 +42,7 @@ public class SocketServer extends WebSocketServer {
private SocketServerDatabase database; private SocketServerDatabase database;
private MessageEventDispatcher messageEventDispatcher = new MessageEventDispatcher(); private MessageDispatcher messageDispatcher = new MessageDispatcher();
public SocketServer(InetSocketAddress address, ServerConfiguration config) { public SocketServer(InetSocketAddress address, ServerConfiguration config) {
super(address); super(address);
@ -64,14 +64,14 @@ public class SocketServer extends WebSocketServer {
database = new SocketServerDatabase(config); database = new SocketServerDatabase(config);
messageEventDispatcher.addHandler(new UserInfoRequestHandler()); messageDispatcher.addHandler(new UserInfoRequestHandler());
messageEventDispatcher.addHandler(new TerrainRequestHandler()); messageDispatcher.addHandler(new TerrainRequestHandler());
messageEventDispatcher.addHandler(new ObjectsRequestHandler()); messageDispatcher.addHandler(new ObjectsRequestHandler());
messageEventDispatcher.addHandler(new CodeUploadHandler()); messageDispatcher.addHandler(new CodeUploadHandler());
messageEventDispatcher.addHandler(new CodeRequestHandler()); messageDispatcher.addHandler(new CodeRequestHandler());
messageEventDispatcher.addHandler(new KeypressHandler()); messageDispatcher.addHandler(new KeypressHandler());
messageEventDispatcher.addHandler(new FloppyHandler()); messageDispatcher.addHandler(new FloppyHandler());
messageEventDispatcher.addHandler(new DebugCommandHandler()); messageDispatcher.addHandler(new DebugCommandHandler());
} }
@ -95,7 +95,7 @@ public class SocketServer extends WebSocketServer {
if (onlineUser.isAuthenticated()) { if (onlineUser.isAuthenticated()) {
messageEventDispatcher.dispatch(onlineUser, message); messageDispatcher.dispatch(onlineUser, message);
} else { } else {
LogManager.LOGGER.info("(WS) Received message from unauthenticated user " + conn.getRemoteSocketAddress()); LogManager.LOGGER.info("(WS) Received message from unauthenticated user " + conn.getRemoteSocketAddress());

2
Server/src/main/java/net/simon987/server/webserver/TerrainRequestHandler.java
View File

@ -18,7 +18,7 @@ public class TerrainRequestHandler implements MessageHandler {
try { try {
world = GameServer.INSTANCE.getGameUniverse().getWorld( world = GameServer.INSTANCE.getGameUniverse().getWorld(
Long.valueOf((long) json.get("x")).intValue(), Long.valueOf((long) json.get("x")).intValue(),
Long.valueOf((long) json.get("y")).intValue(), true, Long.valueOf((long) json.get("y")).intValue(), false,
(String) json.get("dimension")); (String) json.get("dimension"));
} catch (NullPointerException e) { } catch (NullPointerException e) {
LogManager.LOGGER.severe("FIXME: handle TerrainRequestHandler"); LogManager.LOGGER.severe("FIXME: handle TerrainRequestHandler");

8
Server/src/main/resources/config.properties
View File

@ -95,9 +95,9 @@ user_timeout=100
# ---------------------------------------------- # ----------------------------------------------
vault_door_open_time=4 vault_door_open_time=4
electric_box_hp=250 electric_box_hp=250
min_electric_box_count=3 min_electric_box_count=1
min_electric_box_respawn_count=3 min_electric_box_respawn_count=1
max_electric_box_respawn_count=5 max_electric_box_respawn_count=4
electric_box_respawnTime=64 electric_box_respawnTime=256
electric_box_damage=5 electric_box_damage=5
electric_box_energy_given=70 electric_box_energy_given=70