From 86d5a1866dd3e4472fa587d4e0dde71ff590a81a Mon Sep 17 00:00:00 2001 From: Daniel Walsh Date: Tue, 24 Dec 2019 22:36:50 +0000 Subject: [PATCH 1/2] Fix NPE in #getSize --- .../java/uk/antiperson/stackmob/api/entity/StackTools.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/API/src/main/java/uk/antiperson/stackmob/api/entity/StackTools.java b/API/src/main/java/uk/antiperson/stackmob/api/entity/StackTools.java index 97d3963..d109c53 100644 --- a/API/src/main/java/uk/antiperson/stackmob/api/entity/StackTools.java +++ b/API/src/main/java/uk/antiperson/stackmob/api/entity/StackTools.java @@ -57,11 +57,11 @@ public static void incrementWaiting(Entity entity){ } public static int getWaitingTime(Entity entity){ - return waiting.get(entity.getUniqueId()); + return waiting.getOrDefault(entity.getUniqueId(), -1); } public static int getSize(Entity entity){ - return currentEntities.get(entity.getUniqueId()); + return currentEntities.getOrDefault(entity.getUniqueId(), -1); } public static void setSize(Entity entity, int newSize){ From 70396ba687525289044ea8c51445b54b837c8ac4 Mon Sep 17 00:00:00 2001 From: Daniel Walsh Date: Tue, 24 Dec 2019 22:48:40 +0000 Subject: [PATCH 2/2] Make default size 1 --- .../main/java/uk/antiperson/stackmob/api/entity/StackTools.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API/src/main/java/uk/antiperson/stackmob/api/entity/StackTools.java b/API/src/main/java/uk/antiperson/stackmob/api/entity/StackTools.java index d109c53..2967929 100644 --- a/API/src/main/java/uk/antiperson/stackmob/api/entity/StackTools.java +++ b/API/src/main/java/uk/antiperson/stackmob/api/entity/StackTools.java @@ -61,7 +61,7 @@ public static int getWaitingTime(Entity entity){ } public static int getSize(Entity entity){ - return currentEntities.getOrDefault(entity.getUniqueId(), -1); + return currentEntities.getOrDefault(entity.getUniqueId(), 1); } public static void setSize(Entity entity, int newSize){