From c772abe0bf6c423586a9895e02dee550663c0be4 Mon Sep 17 00:00:00 2001
From: simon <Anise5-humid5-Allow-5Lulu-Honk>
Date: Sat, 20 Jan 2018 12:33:01 -0500
Subject: [PATCH] Fixed opcode clash for PUSHF instruction

---
 .../simon987/server/assembly/instruction/PushfInstruction.java  | 2 +-
 .../net/simon987/server/webserver/TerrainRequestHandler.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/PushfInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/PushfInstruction.java
index efa54ca..9049b1d 100644
--- a/Server/src/main/java/net/simon987/server/assembly/instruction/PushfInstruction.java
+++ b/Server/src/main/java/net/simon987/server/assembly/instruction/PushfInstruction.java
@@ -13,7 +13,7 @@ public class PushfInstruction extends Instruction {
     /**
      * Opcode of the instruction
      */
-    public static final int OPCODE = 43;
+    public static final int OPCODE = 45;
 
     private CPU cpu;
 
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 e566e96..702ed20 100644
--- a/Server/src/main/java/net/simon987/server/webserver/TerrainRequestHandler.java
+++ b/Server/src/main/java/net/simon987/server/webserver/TerrainRequestHandler.java
@@ -17,7 +17,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);
             } catch (NullPointerException e) {
                 LogManager.LOGGER.severe("FIXME: handle TerrainRequestHandler");
                 return;