Merge pull request #47 from Nookure/dev

Fix chest oppening
Nookure · Sep 10, 2023 · 6acb06b · 6acb06b
2 parents 747aa6c + e49d3d2
commit 6acb06b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 57 deletions.
diff --git a/.github/workflows/Javadoc.yml b/.github/workflows/Javadoc.yml
@@ -10,8 +10,6 @@ name: JavaDoc Generator
 on:
   push:
     branches: [ 2.x ]
-  pull_request:
-    branches: [ 2.x ]
 jobs:
 
   build-on-ubuntu:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Seting up JDK 1.8
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2

diff --git a/.github/workflows/publish-api.yml b/.github/workflows/publish-api.yml
diff --git a/MAStaff-Bukkit/src/main/java/es/angelillo15/mast/bukkit/listener/staffmode/OnOpenChest.java b/MAStaff-Bukkit/src/main/java/es/angelillo15/mast/bukkit/listener/staffmode/OnOpenChest.java
@@ -14,39 +14,38 @@
 import org.bukkit.inventory.Inventory;
 
 public class OnOpenChest implements Listener {
-    @Inject
-    private StaffManager staffManager;
+  @Inject
+  private StaffManager staffManager;
 
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onPlayerInteract(PlayerInteractEvent event) {
-        Player player = event.getPlayer();
+  @EventHandler(priority = EventPriority.HIGHEST)
+  public void onPlayerInteract(PlayerInteractEvent event) {
+    Player player = event.getPlayer();
 
-        if (!staffManager.isStaffPlayer(player)) {
-            return;
-        }
-
-        IStaffPlayer staffPlayer = staffManager.getStaffPlayer(player);
-
-        if (!staffPlayer.isStaffMode()) {
-            return;
-        }
+    if (!staffManager.isStaffPlayer(player)) {
+      return;
+    }
 
-        if (event.getClickedBlock() == null) {
-            return;
-        }
+    IStaffPlayer staffPlayer = staffManager.getStaffPlayer(player);
 
-        if (!event.getClickedBlock().getType().name().contains("CHEST")) {
-            return;
-        }
+    if (!staffPlayer.isStaffMode()) {
+      return;
+    }
 
-        Container container = (Container) event.getClickedBlock().getState();
+    if (event.getClickedBlock() == null) {
+      return;
+    }
 
-        if (container instanceof Chest chest) {
-          Inventory cInv = Bukkit.createInventory(null, chest.getInventory().getSize(), chest.getInventory().getType().name());
+    if (!event.getClickedBlock().getType().name().contains("CHEST")) {
+      return;
+    }
 
-            player.openInventory(cInv);
+    Container container = (Container) event.getClickedBlock().getState();
 
-            event.setCancelled(true);
-        }
+    if (container instanceof Chest chest) {
+      Inventory cInv = Bukkit.createInventory(null, chest.getInventory().getSize(), chest.getInventory().getType().name());
+      cInv.setContents(chest.getInventory().getContents());
+      player.openInventory(cInv);
+      event.setCancelled(true);
     }
+  }
 }