From 1d780f7d9b8c81fab5a71195a136ebd898e4f5ca Mon Sep 17 00:00:00 2001
From: simon <Anise5-humid5-Allow-5Lulu-Honk>
Date: Sun, 11 Mar 2018 13:34:10 -0400
Subject: [PATCH] Minor refactor

---
 ...Dispatcher.java => MessageDispatcher.java} |  5 ++---
 .../server/webserver/SocketServer.java        | 20 +++++++++----------
 .../webserver/TerrainRequestHandler.java      |  2 +-
 Server/src/main/resources/config.properties   |  8 ++++----
 4 files changed, 17 insertions(+), 18 deletions(-)
 rename Server/src/main/java/net/simon987/server/webserver/{MessageEventDispatcher.java => MessageDispatcher.java} (95%)

diff --git a/Server/src/main/java/net/simon987/server/webserver/MessageEventDispatcher.java b/Server/src/main/java/net/simon987/server/webserver/MessageDispatcher.java
similarity index 95%
rename from Server/src/main/java/net/simon987/server/webserver/MessageEventDispatcher.java
rename to Server/src/main/java/net/simon987/server/webserver/MessageDispatcher.java
index 5e52539..d289424 100644
--- a/Server/src/main/java/net/simon987/server/webserver/MessageEventDispatcher.java
+++ b/Server/src/main/java/net/simon987/server/webserver/MessageDispatcher.java
@@ -9,18 +9,17 @@ import org.json.simple.parser.ParseException;
 
 import java.util.ArrayList;
 
-public class MessageEventDispatcher {
+public class MessageDispatcher {
 
     private ArrayList<MessageHandler> handlers = new ArrayList<>(10);
 
-    public MessageEventDispatcher() {
+    public MessageDispatcher() {
 
     }
 
     public void addHandler(MessageHandler handler) {
 
         handlers.add(handler);
-
     }
 
     public void dispatch(OnlineUser user, String message) {
diff --git a/Server/src/main/java/net/simon987/server/webserver/SocketServer.java b/Server/src/main/java/net/simon987/server/webserver/SocketServer.java
index a297709..4166ebb 100644
--- a/Server/src/main/java/net/simon987/server/webserver/SocketServer.java
+++ b/Server/src/main/java/net/simon987/server/webserver/SocketServer.java
@@ -42,7 +42,7 @@ public class SocketServer extends WebSocketServer {
 
     private SocketServerDatabase database;
 
-    private MessageEventDispatcher messageEventDispatcher = new MessageEventDispatcher();
+    private MessageDispatcher messageDispatcher = new MessageDispatcher();
 
     public SocketServer(InetSocketAddress address, ServerConfiguration config) {
         super(address);
@@ -64,14 +64,14 @@ public class SocketServer extends WebSocketServer {
 
         database = new SocketServerDatabase(config);
 
-        messageEventDispatcher.addHandler(new UserInfoRequestHandler());
-        messageEventDispatcher.addHandler(new TerrainRequestHandler());
-        messageEventDispatcher.addHandler(new ObjectsRequestHandler());
-        messageEventDispatcher.addHandler(new CodeUploadHandler());
-        messageEventDispatcher.addHandler(new CodeRequestHandler());
-        messageEventDispatcher.addHandler(new KeypressHandler());
-        messageEventDispatcher.addHandler(new FloppyHandler());
-        messageEventDispatcher.addHandler(new DebugCommandHandler());
+        messageDispatcher.addHandler(new UserInfoRequestHandler());
+        messageDispatcher.addHandler(new TerrainRequestHandler());
+        messageDispatcher.addHandler(new ObjectsRequestHandler());
+        messageDispatcher.addHandler(new CodeUploadHandler());
+        messageDispatcher.addHandler(new CodeRequestHandler());
+        messageDispatcher.addHandler(new KeypressHandler());
+        messageDispatcher.addHandler(new FloppyHandler());
+        messageDispatcher.addHandler(new DebugCommandHandler());
 
     }
 
@@ -95,7 +95,7 @@ public class SocketServer extends WebSocketServer {
 
             if (onlineUser.isAuthenticated()) {
 
-                messageEventDispatcher.dispatch(onlineUser, message);
+                messageDispatcher.dispatch(onlineUser, message);
 
             } else {
                 LogManager.LOGGER.info("(WS) Received message from unauthenticated user " + conn.getRemoteSocketAddress());
diff --git a/Server/src/main/java/net/simon987/server/webserver/TerrainRequestHandler.java b/Server/src/main/java/net/simon987/server/webserver/TerrainRequestHandler.java
index cf52a0a..01e144f 100644
--- a/Server/src/main/java/net/simon987/server/webserver/TerrainRequestHandler.java
+++ b/Server/src/main/java/net/simon987/server/webserver/TerrainRequestHandler.java
@@ -18,7 +18,7 @@ public class TerrainRequestHandler implements MessageHandler {
             try {
                 world = GameServer.INSTANCE.getGameUniverse().getWorld(
                         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"));
             } catch (NullPointerException e) {
                 LogManager.LOGGER.severe("FIXME: handle TerrainRequestHandler");
diff --git a/Server/src/main/resources/config.properties b/Server/src/main/resources/config.properties
index 4d6299a..2fdf094 100644
--- a/Server/src/main/resources/config.properties
+++ b/Server/src/main/resources/config.properties
@@ -95,9 +95,9 @@ user_timeout=100
 # ----------------------------------------------
 vault_door_open_time=4
 electric_box_hp=250
-min_electric_box_count=3
-min_electric_box_respawn_count=3
-max_electric_box_respawn_count=5
-electric_box_respawnTime=64
+min_electric_box_count=1
+min_electric_box_respawn_count=1
+max_electric_box_respawn_count=4
+electric_box_respawnTime=256
 electric_box_damage=5
 electric_box_energy_given=70
\ No newline at end of file