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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Jacob Swehla 2017-12-28 16:41:05 -06:00
commit 9d184cb515
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Plugin NPC/plugin.properties → Plugin NPC/src/main/resources/plugin.properties
View File

8
Server/src/main/java/net/simon987/server/webserver/KeypressHandler.java
View File

@ -3,6 +3,8 @@ package net.simon987.server.webserver;
import net.simon987.server.logging.LogManager; import net.simon987.server.logging.LogManager;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import java.util.ArrayList;
public class KeypressHandler implements MessageHandler { public class KeypressHandler implements MessageHandler {
@ -16,7 +18,11 @@ public class KeypressHandler implements MessageHandler {
int key = (int) (long) json.get("k"); int key = (int) (long) json.get("k");
user.getUser().getControlledUnit().getKeyboardBuffer().add(key); ArrayList<Integer> buffer = user.getUser().getControlledUnit().getKeyboardBuffer();
if (buffer.size() < 16) {
buffer.add(key);
}
} }
} }
} }

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

@ -57,8 +57,7 @@ public class SocketServer extends WebSocketServer {
} }
} }
setConnectionLostTimeout(30); setConnectionLostTimeout(120);
database = new SocketServerDatabase(config); database = new SocketServerDatabase(config);