Fix backpack IDs not incrementing (Slimefun#4081)

xMikux · Jan 7, 2024 · 158c6ee · 158c6ee
1 parent 4ab6388
commit 158c6ee
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java
@@ -91,7 +91,10 @@ protected PlayerProfile(@Nonnull OfflinePlayer p, PlayerData data) {
      * Only intended for internal usage.
      * 
      * @return The {@link Config} associated with this {@link PlayerProfile}
+     *
+     * @deprecated Look at {@link PlayerProfile#getPlayerData()} instead for reading data.
      */
+    @Deprecated
     public @Nonnull Config getConfig() {
         return configFile;
     }
@@ -245,10 +248,9 @@ public final void markDirty() {
     }
 
     public @Nonnull PlayerBackpack createBackpack(int size) {
-        IntStream stream = IntStream.iterate(0, i -> i + 1).filter(i -> !configFile.contains("backpacks." + i + ".size"));
-        int id = stream.findFirst().getAsInt();
+        int nextId = this.data.getBackpacks().size(); // Size is not 0 indexed so next ID can just be the current size
 
-        PlayerBackpack backpack = PlayerBackpack.newBackpack(this.ownerId, id, size);
+        PlayerBackpack backpack = PlayerBackpack.newBackpack(this.ownerId, nextId, size);
         this.data.addBackpack(backpack);
 
         markDirty();

diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestPlayerBackpacks.java b/src/test/java/io/github/thebusybiscuit/slimefun4/api/profiles/TestPlayerBackpacks.java
@@ -47,6 +47,21 @@ void testCreateBackpack() throws InterruptedException {
         Assertions.assertEquals(18, backpack.getInventory().getSize());
     }
 
+    @Test
+    @DisplayName("Test creating a new backpack will increment the id")
+    void testCreateBackpackIncrementsId() throws InterruptedException {
+        Player player = server.addPlayer();
+        PlayerProfile profile = TestUtilities.awaitProfile(player);
+
+        PlayerBackpack backpackOne = profile.createBackpack(18);
+        PlayerBackpack backpackTwo = profile.createBackpack(18);
+        PlayerBackpack backpackThree = profile.createBackpack(18);
+
+        Assertions.assertEquals(0, backpackOne.getId());
+        Assertions.assertEquals(1, backpackTwo.getId());
+        Assertions.assertEquals(2, backpackThree.getId());
+    }
+
     @Test
     @DisplayName("Test upgrading the backpack size")
     void testChangeSize() throws InterruptedException {