diff --git a/Plugin Cubot/Plugin Cubot.iml b/Plugin Cubot/Plugin Cubot.iml
index f96bbb7..664a89e 100644
--- a/Plugin Cubot/Plugin Cubot.iml
+++ b/Plugin Cubot/Plugin Cubot.iml
@@ -17,6 +17,9 @@
+
+
+
diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLidar.java b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLidar.java
index dd5eb0b..89a63d3 100644
--- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLidar.java
+++ b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLidar.java
@@ -108,8 +108,8 @@ public class CubotLidar extends HardwareModule {
//Write map data to the location specified by register X
int i = getCpu().getRegisterSet().getRegister("X").getValue();
- for (int x = 0; x < unit.getWorld().getWorldSize(); x++) {
- for (int y = 0; y < unit.getWorld().getWorldSize(); y++) {
+ for (int y = 0; y < unit.getWorld().getWorldSize(); y++) {
+ for (int x = 0; x < unit.getWorld().getWorldSize(); x++) {
getCpu().getMemory().set(i++, mapInfo[x][y]);
}
}
diff --git a/Plugin Misc HW/Plugin Misc HW.iml b/Plugin Misc HW/Plugin Misc HW.iml
index 7e03db0..888dbdd 100644
--- a/Plugin Misc HW/Plugin Misc HW.iml
+++ b/Plugin Misc HW/Plugin Misc HW.iml
@@ -16,6 +16,9 @@
+
+
+
diff --git a/Plugin NPC/Plugin NPC.iml b/Plugin NPC/Plugin NPC.iml
index b9c98db..ef4c8cd 100644
--- a/Plugin NPC/Plugin NPC.iml
+++ b/Plugin NPC/Plugin NPC.iml
@@ -16,6 +16,9 @@
+
+
+
diff --git a/Plugin Plant/Plugin Plant.iml b/Plugin Plant/Plugin Plant.iml
index b9c98db..ef4c8cd 100644
--- a/Plugin Plant/Plugin Plant.iml
+++ b/Plugin Plant/Plugin Plant.iml
@@ -16,6 +16,9 @@
+
+
+
diff --git a/Server/Server.iml b/Server/Server.iml
index fbb67a2..09d7783 100644
--- a/Server/Server.iml
+++ b/Server/Server.iml
@@ -16,6 +16,9 @@
+
+
+
diff --git a/Server/src/main/java/net/simon987/server/websocket/TerrainRequestHandler.java b/Server/src/main/java/net/simon987/server/websocket/TerrainRequestHandler.java
index 9ce6349..8036815 100644
--- a/Server/src/main/java/net/simon987/server/websocket/TerrainRequestHandler.java
+++ b/Server/src/main/java/net/simon987/server/websocket/TerrainRequestHandler.java
@@ -19,7 +19,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,
(String) json.get("dimension"));
} catch (NullPointerException e) {
LogManager.LOGGER.severe("FIXME: handle TerrainRequestHandler");
diff --git a/Server/src/main/resources/config.properties b/Server/src/main/resources/config.properties
index 391d76a..49a4cf7 100644
--- a/Server/src/main/resources/config.properties
+++ b/Server/src/main/resources/config.properties
@@ -40,7 +40,7 @@ wg_maxCopperCount=2
wg_fluidCenterPointMin=0
wg_fluidCenterPointMax=2
#CPU
-tick_length=50
+tick_length=1000
org_offset=512
stack_bottom=65536
memory_size=65536
@@ -66,13 +66,13 @@ shield_energy_cost=50
npc_lifetime=1024
npc_max_factory_distance=3
factory_max_npc_count=16
-factory_program_size=1024
+factory_program_size=2048
settlement_spawn_rate=35
harvester_hp_max=100
harvester_regen=5
harvester_biomass_drop_count=8
radio_tower_range=3
-hacked_npc_mem_size=5120
+hacked_npc_mem_size=8192
npc_exec_time=5
hacked_npc_die_on_no_energy=1
#Vaults