simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-12-13 14:49:03 +00:00
Code Issues Projects Releases Wiki Activity

Cubot are now passable + Bug fixes

Browse Source
This commit is contained in:
simon
2017-12-28 13:34:11 -05:00
parent 690b7e8d31
commit 21ec4ae704
11 changed files with 13 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Server/Server.iml
View File

@@ -5,6 +5,8 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/${parent.project.basedir}/ServerTarget" />
<excludeFolder url="file://$MODULE_DIR$/ServerTarget" />
<excludeFolder url="file://$MODULE_DIR$/target" />

1
Server/src/main/java/net/simon987/server/assembly/MachineCode.java
View File

@@ -67,7 +67,6 @@ class MachineCode {
LogManager.LOGGER.severe("Couldn't write the dst operand for instruction :" + dst);
} else {
//Src is the 5 most significant bits
value &= 0xF83F; //1111 1000 0011 1111
dst <<= 6; //0000 0XXX XX00 0000
value |= dst;

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

@@ -166,7 +166,8 @@ public class SocketServer extends WebSocketServer {
LogManager.LOGGER.info("Notified " + userManager.getOnlineUsers().size() + " users");
for (OnlineUser user : userManager.getOnlineUsers()) {
ArrayList<OnlineUser> onlineUsers = new ArrayList<>(userManager.getOnlineUsers()); //Avoid ConcurrentModificationException
for (OnlineUser user : onlineUsers) {
if (user.getWebSocket().isOpen()) {