simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-19 18:46:43 +00:00
Code Issues Projects Releases Wiki Activity

Fixed opcode clash for PUSHF instruction

Browse Source
This commit is contained in:
simon 2018-01-20 12:33:01 -05:00
parent 210e579995
commit c772abe0bf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Server/src/main/java/net/simon987/server/assembly/instruction/PushfInstruction.java
View File

@ -13,7 +13,7 @@ public class PushfInstruction extends Instruction {
/** /**
* Opcode of the instruction * Opcode of the instruction
*/ */
public static final int OPCODE = 43; public static final int OPCODE = 45;
private CPU cpu; private CPU cpu;

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

@ -17,7 +17,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);
} catch (NullPointerException e) { } catch (NullPointerException e) {
LogManager.LOGGER.severe("FIXME: handle TerrainRequestHandler"); LogManager.LOGGER.severe("FIXME: handle TerrainRequestHandler");
return; return;