From 9564c36706fd787e88fcdcead111f374023603a3 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Tue, 9 Mar 2021 21:32:19 -0600 Subject: [PATCH] Added full seedling + sapling functionality --- Server/src/main/java/Server/core/game/container/Container.java | 1 + .../core/game/node/entity/state/newsys/states/SeedlingState.kt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Server/src/main/java/Server/core/game/container/Container.java b/Server/src/main/java/Server/core/game/container/Container.java index 06e40ec7c..c8cfd7a6b 100644 --- a/Server/src/main/java/Server/core/game/container/Container.java +++ b/Server/src/main/java/Server/core/game/container/Container.java @@ -806,6 +806,7 @@ public class Container { public Item get(Item item){ for(Item i : items){ + if(i == null) continue; if(item.getId() == i.getId()) return i; } return null; diff --git a/Server/src/main/java/Server/core/game/node/entity/state/newsys/states/SeedlingState.kt b/Server/src/main/java/Server/core/game/node/entity/state/newsys/states/SeedlingState.kt index 531b668ce..6f00b7928 100644 --- a/Server/src/main/java/Server/core/game/node/entity/state/newsys/states/SeedlingState.kt +++ b/Server/src/main/java/Server/core/game/node/entity/state/newsys/states/SeedlingState.kt @@ -67,7 +67,8 @@ class SeedlingState(player: Player? = null) : State(player) { val inBank = player.bank.get(Item(seed.id)) if(inBank == null) removeList.add(seed) else { - player.bank.replace(Item(seed.sapling), inBank.slot) + player.bank.remove(Item(inBank.id,1)) + player.bank.add(Item(seed.sapling)) removeList.add(seed) } }