fix default button flooding all buttons in SimpleButtonMap

HSGamer · Jun 29, 2024 · 116867b · 116867b
1 parent 9a1e9b5
commit 116867b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...raft-gui-simple/src/main/java/me/hsgamer/hscore/minecraft/gui/simple/SimpleButtonMap.java b/...raft-gui-simple/src/main/java/me/hsgamer/hscore/minecraft/gui/simple/SimpleButtonMap.java
@@ -98,18 +98,18 @@ public void stop() {
     Map<Integer, DisplayButton> map = new HashMap<>();
     IntFunction<DisplayButton> getDisplayButton = i -> map.computeIfAbsent(i, s -> new DisplayButton());
 
-    buttonSlotMap.forEach((button, slots) -> {
-      DisplayButton displayButton = button.display(uuid);
-      if (displayButton == null) return;
-      slots.forEach(slot -> getDisplayButton.apply(slot).apply(displayButton));
-    });
-
     Button defaultButton = getDefaultButton();
     DisplayButton defaultDisplayButton = defaultButton.display(uuid);
     if (defaultDisplayButton != null) {
       inventorySize.getSlots().forEach(i -> getDisplayButton.apply(i).apply(defaultDisplayButton));
     }
 
+    buttonSlotMap.forEach((button, slots) -> {
+      DisplayButton displayButton = button.display(uuid);
+      if (displayButton == null) return;
+      slots.forEach(slot -> getDisplayButton.apply(slot).apply(displayButton));
+    });
+
     return map;
   }
 }