From dc5b76473295be9936bb6de3bba14e0f14eb15ea Mon Sep 17 00:00:00 2001 From: TheMode Date: Wed, 14 Apr 2021 07:25:51 +0200 Subject: [PATCH] Inventory id generation cleanup --- .../java/net/minestom/server/inventory/Inventory.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minestom/server/inventory/Inventory.java b/src/main/java/net/minestom/server/inventory/Inventory.java index 2f68fdf0f..9935653eb 100644 --- a/src/main/java/net/minestom/server/inventory/Inventory.java +++ b/src/main/java/net/minestom/server/inventory/Inventory.java @@ -29,7 +29,7 @@ import java.util.concurrent.CopyOnWriteArraySet; public class Inventory extends AbstractInventory implements Viewable { // incremented each time an inventory is created (used in the window packets) - private static byte LAST_INVENTORY_ID = 1; + private static byte LAST_INVENTORY_ID; // the id of this inventory private final byte id; @@ -60,12 +60,10 @@ public class Inventory extends AbstractInventory implements Viewable { } private static synchronized byte generateId() { - if (LAST_INVENTORY_ID != Byte.MAX_VALUE) { - return ++LAST_INVENTORY_ID; - } else { - LAST_INVENTORY_ID = 1; - return LAST_INVENTORY_ID; + if (LAST_INVENTORY_ID == Byte.MAX_VALUE) { + LAST_INVENTORY_ID = 0; } + return ++LAST_INVENTORY_ID; } /**