From 96fc3ed68cfa05f70d0be80b3fae0aabd8c8313b Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 13 Aug 2018 15:43:41 -0400 Subject: [PATCH] Should fix server crash problem when harvesting biomass --- .../main/java/net/simon987/cubotplugin/CubotInventory.java | 2 +- .../src/main/java/net/simon987/biomassplugin/ItemBiomass.java | 4 ++++ .../main/java/net/simon987/server/game/item/ItemCopper.java | 4 ++++ .../src/main/java/net/simon987/server/game/item/ItemIron.java | 4 ++++ .../src/main/java/net/simon987/server/game/world/TileMap.java | 2 -- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotInventory.java b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotInventory.java index 0569a5a..eb2f528 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotInventory.java +++ b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotInventory.java @@ -31,7 +31,7 @@ public class CubotInventory extends CubotHardwareModule { super(cubot); inventory = new HashMap<>(); - inventory.put(2, new ItemCopper(new Document())); + inventory.put(2, new ItemCopper(new Document())); // TODO: Remove debug value } public CubotInventory(Document document, ControllableUnit cubot) { diff --git a/Plugin Plant/src/main/java/net/simon987/biomassplugin/ItemBiomass.java b/Plugin Plant/src/main/java/net/simon987/biomassplugin/ItemBiomass.java index e41cba3..7a02155 100644 --- a/Plugin Plant/src/main/java/net/simon987/biomassplugin/ItemBiomass.java +++ b/Plugin Plant/src/main/java/net/simon987/biomassplugin/ItemBiomass.java @@ -17,6 +17,10 @@ public class ItemBiomass extends Item { return ID; } + public ItemBiomass() { + super(null); + } + public ItemBiomass(Document document) { super(document); } diff --git a/Server/src/main/java/net/simon987/server/game/item/ItemCopper.java b/Server/src/main/java/net/simon987/server/game/item/ItemCopper.java index f5eb5ff..5d3ce18 100644 --- a/Server/src/main/java/net/simon987/server/game/item/ItemCopper.java +++ b/Server/src/main/java/net/simon987/server/game/item/ItemCopper.java @@ -12,6 +12,10 @@ public class ItemCopper extends Item { return ID; } + public ItemCopper() { + super(null); + } + public ItemCopper(Document document) { super(document); } diff --git a/Server/src/main/java/net/simon987/server/game/item/ItemIron.java b/Server/src/main/java/net/simon987/server/game/item/ItemIron.java index dcebf1d..4033101 100644 --- a/Server/src/main/java/net/simon987/server/game/item/ItemIron.java +++ b/Server/src/main/java/net/simon987/server/game/item/ItemIron.java @@ -11,6 +11,10 @@ public class ItemIron extends Item { return ID; } + public ItemIron() { + super(null); + } + public ItemIron(Document document) { super(document); } diff --git a/Server/src/main/java/net/simon987/server/game/world/TileMap.java b/Server/src/main/java/net/simon987/server/game/world/TileMap.java index cf1481a..642d4c0 100755 --- a/Server/src/main/java/net/simon987/server/game/world/TileMap.java +++ b/Server/src/main/java/net/simon987/server/game/world/TileMap.java @@ -28,8 +28,6 @@ public class TileMap implements JSONSerialisable, MongoSerializable { public static final int VAULT_FLOOR = 4; public static final int VAULT_WALL = 5; - public static final int ITEM_IRON = 3; - public static final int ITEM_COPPER = 4; /** * The map of tile