Edge case fixes for dummy slots

SpongePowered · Nov 23, 2024 · a6eb8a0 · a6eb8a0
1 parent c54c2b5
commit a6eb8a0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/org/spongepowered/common/inventory/custom/SpongeViewableInventoryBuilder.java b/src/main/java/org/spongepowered/common/inventory/custom/SpongeViewableInventoryBuilder.java
@@ -138,6 +138,7 @@ private Slot newDummySlot() {
     // Slot definition Impl:
     public BuildingStep slotsAtIndizes(List<Slot> source, List<Integer> at) {
         Validate.isTrue(source.size() == at.size(), "Source and index list sizes differ");
+        this.lastSlot = null;
         for (int i = 0; i < at.size(); i++) {
             Slot slot = source.get(i);
             Integer index = at.get(i);
@@ -215,7 +216,9 @@ public BuildingStep grid(List<Slot> source, Vector2i size, int offset) {
     // dummy
     @Override
     public BuildingStep item(ItemStackLike item) {
-        this.lastSlot.set(item);
+        if (this.lastSlot != null) {
+            this.lastSlot.set(item);
+        }
         return this;
     }