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

Bug fixes related to floppy drive

Browse Source
This commit is contained in:
simon
2017-11-14 20:58:07 -05:00
parent cfb8050cee
commit 8701007ad9
4 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Server/src/net/simon987/server/GameServer.java
View File

@@ -108,8 +108,14 @@ public class GameServer implements Runnable {
for (User user : users_) {
if(user.getCpu() != null){
user.getCpu().reset();
user.getCpu().execute();
try {
user.getCpu().reset();
user.getCpu().execute();
} catch (Exception e) {
LogManager.LOGGER.severe("Error executing " + user.getUsername() + "'s code");
e.printStackTrace();
}
}
}

2
Server/src/net/simon987/server/assembly/Memory.java
View File

@@ -60,7 +60,7 @@ public class Memory implements Target, JSONSerialisable {
offset = (char)offset * 2;
if (offset + count > this.bytes.length || count < 0 || offset < 0) {
if (offset + count > this.bytes.length || count < 0 || offset < 0 || srcOffset >= bytes.length) {
return false;
}