Merge remote-tracking branch 'Slimefun/master'

DEV - 1103
xMikux · Sep 30, 2023 · 09287ca · 09287ca
2 parents a5ce3f3 + b6b091a
commit 09287ca
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/discord-webhook.yml b/.github/workflows/discord-webhook.yml
@@ -21,10 +21,10 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3.6.0
+      uses: actions/checkout@v4.1.0
 
     - name: Set up Java JDK 17
-      uses: actions/setup-java@v3.12.0
+      uses: actions/setup-java@v3.13.0
       with:
         distribution: 'adopt'
         java-version: '17'

diff --git a/.github/workflows/json-validator.yml b/.github/workflows/json-validator.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Validate wiki.json
       uses: docker://orrosenblatt/validate-json-action:latest@sha256:02370758b8b199e0477da11ecfdd498c75c561685056b5c31b925a4ab95df7f4
       env:

diff --git a/.github/workflows/maven-compiler.yml b/.github/workflows/maven-compiler.yml
@@ -25,10 +25,10 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v3.12.0
+      uses: actions/setup-java@v3.13.0
       with:
         distribution: 'adopt'
         java-version: '17'

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -17,10 +17,10 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v3.12.0
+      uses: actions/setup-java@v3.13.0
       with:
         distribution: 'adopt'
         java-version: '17'

diff --git a/.github/workflows/release-candidates.yml b/.github/workflows/release-candidates.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: 'stable'
 

diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: YAML Linter
       uses: ibiqlik/[email protected]
       with:

diff --git a/pom.xml b/pom.xml
@@ -158,7 +158,7 @@
                 <!-- Sonarcloud Scanner -->
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
-                <version>3.9.1.2184</version>
+                <version>3.10.0.2594</version>
             </plugin>
 
             <plugin>
@@ -191,7 +191,7 @@
                 <!-- Dependency shading -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.5.1</version>
 
                 <configuration>
                     <!-- Relocate these to avoid clashes and conflicts -->
@@ -239,7 +239,7 @@
                 <!-- Javadocs -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.0</version>
 
                 <configuration>
                     <reportOutputDirectory>${project.basedir}</reportOutputDirectory>
@@ -460,7 +460,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.3</version>
+            <version>2.11.4</version>
             <scope>provided</scope>
 
             <exclusions>
@@ -488,7 +488,7 @@
         <dependency>
             <groupId>com.github.LoneDev6</groupId>
             <artifactId>itemsadder-api</artifactId>
-            <version>3.5.0b</version>
+            <version>3.5.0c-r5</version>
             <scope>provided</scope>
 
             <exclusions>

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
@@ -141,15 +141,15 @@ public void onBlockBreak(BlockBreakEvent e) {
             }
         }
 
-        if (!e.isCancelled()) {
-            checkForSensitiveBlockAbove(e.getPlayer(), e.getBlock(), item);
+        List<ItemStack> drops = new ArrayList<>();
 
+        if (!item.getType().isAir()) {
             int fortune = getBonusDropsWithFortune(item, e.getBlock());
-            List<ItemStack> drops = new ArrayList<>();
+            callToolHandler(e, item, fortune, drops);
+        }
 
-            if (!item.getType().isAir()) {
-                callToolHandler(e, item, fortune, drops);
-            }
+        if (!e.isCancelled()) {
+            checkForSensitiveBlockAbove(e.getPlayer(), e.getBlock(), item);
 
             callBlockHandler(e, item, drops, sfItem);
             dropItems(e, drops);