Fix brewing leveler stacking and region saving error

Archy-X · Jan 11, 2024 · 55ddb33 · 55ddb33
1 parent 98a5393
commit 55ddb33
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/api-bukkit/src/main/java/dev/aurelium/auraskills/api/region/package-info.java b/api-bukkit/src/main/java/dev/aurelium/auraskills/api/region/package-info.java
@@ -1,4 +1,4 @@
 /**
- * Region relating classes.
+ * Region related classes.
  */
 package dev.aurelium.auraskills.api.region;
diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/source/BrewingLeveler.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/source/BrewingLeveler.java
@@ -161,7 +161,9 @@ private BrewingStandData getBrewingStandData(ItemStack ingredient, ItemStack[] b
                 if (!beforeItem.equals(afterItem)) {
                     BrewingSlot slot = standData.getSlot(i);
                     slot.setBrewed(true);
-                    slot.addIngredient(ingredient); // Track the ingredient used to brew
+                    if (slot.getIngredients().size() < 5) { // Max 5 ingredients stacked to prevent auto brewing
+                        slot.addIngredient(ingredient); // Track the ingredient used to brew
+                    }
                 }
             }
         }

diff --git a/common/src/main/java/dev/aurelium/auraskills/common/region/RegionManager.java b/common/src/main/java/dev/aurelium/auraskills/common/region/RegionManager.java
@@ -145,7 +145,15 @@ private void saveChunk(CompoundTag compound, ChunkData chunkData) {
             chunk = new CompoundTag();
             compound.put(chunkName, chunk);
         }
-        ListTag<CompoundTag> placedBlocks = chunk.getListTag("placed_blocks").asCompoundTagList();
+        ListTag<?> listTag = chunk.getListTag("placed_blocks");
+        ListTag<CompoundTag> placedBlocks;
+        if (listTag != null) {
+            placedBlocks = listTag.asCompoundTagList();
+        } else {
+            // Create and add placed_blocks ListTag if not exists
+            placedBlocks = new ListTag<>(CompoundTag.class);
+            chunk.put("placed_blocks", placedBlocks);
+        }
         placedBlocks.clear(); // Clears list of block positions to account for removed positions
         // Adds all positions to nbt compound list
         for (BlockPosition block : chunkData.getPlacedBlocks().keySet()) {