Merge branch 'master' into refactoring/third-party-integrations

.github/ISSUE_TEMPLATE/bug-report.md

@@ -2,7 +2,7 @@
 name: Bug Report
 about: Report a Bug or an Issue with Slimefun 4.
 title: ''
-labels: Bug Report
+labels: '🐞 Bug Report'
 assignees: ''
 
 ---

.github/renovate.json

@@ -2,9 +2,7 @@
   "extends": [
     "config:base"
   ],
-  "assignees": [
-  ],
   "labels": [
-    "Dependency Update"
+    "🚨 Dependency Update"
   ]
 }

.github/workflows/auto-approve.yml

@@ -26,4 +26,4 @@ jobs:
       with:
          token: ${{ secrets.ACCESS_TOKEN }}
          issue_number: ${{ github.event.pull_request.number }}
-         labels: 'Translations Update'
+         labels: '📄 Translations Update'

.github/workflows/close-invalid-issues.yml

@@ -10,7 +10,7 @@ jobs:
     name: Invalid Issues
     runs-on: ubuntu-latest
 
-    if: contains(github.event.issue.labels.*.name, 'Bug Report') == false && contains(github.event.issue.labels.*.name, 'Hacktoberfest') == false
+    if: contains(github.event.issue.labels.*.name, '🐞 Bug Report') == false && contains(github.event.issue.labels.*.name, 'Hacktoberfest') == false
     steps:
     - name: Close Issue
       uses: maxkomarychev/octions/octions/issues/update@master

.github/workflows/duplicates.yml

@@ -18,4 +18,4 @@ jobs:
         with:
           token: ${{ secrets.ACCESS_TOKEN }}
           issue_number: ${{ github.event.issue.number }}
-          labels: 'Duplicate'
+          labels: '🚩 Duplicate'

.github/workflows/merge-conflicts.yml

@@ -14,5 +14,5 @@ jobs:
     steps:
     - uses: mschilde/auto-label-merge-conflicts@master
       with:
-        CONFLICT_LABEL_NAME: 'Merge Conflicts'
+        CONFLICT_LABEL_NAME: '⚡ Merge Conflicts'
         GITHUB_TOKEN: "${{ secrets.ACCESS_TOKEN }}"

CHANGELOG.md

@@ -33,6 +33,7 @@
 #### Fixes
 * Fixed a couple of compatibility issues with ItemsAdder
 * Fixed #2575
+* Fixed ghost blocks to some extent (ghost blocks will now drop and be replaced)
 
 ## Release Candidate 18 (03 Dec 2020)
 

pom.xml

@@ -380,7 +380,7 @@
         <dependency>
             <groupId>com.gmail.nossr50.mcMMO</groupId>
             <artifactId>mcMMO</artifactId>
-            <version>2.1.159</version>
+            <version>2.1.161</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java

@@ -41,6 +41,7 @@ import me.mrCookieSlime.Slimefun.api.Slimefun;
  *
  * @author TheBusyBiscuit
  * @author Linox
+ * @author Patbox
  *
  * @see BlockPlaceHandler
  * @see BlockBreakHandler
@@ -60,7 +61,20 @@ public class BlockListener implements Listener {
          * While this can cause ghost blocks it also prevents them from replacing grass
          * or saplings etc...
          */
-        if (BlockStorage.hasBlockInfo(e.getBlock())) {
+        Block block = e.getBlock();
+
+        if (e.getBlockReplacedState().getType().isAir()) {
+            SlimefunItem sfItem = BlockStorage.check(block);
+
+            if (sfItem != null) {
+                for (ItemStack item : sfItem.getDrops()) {
+                    if (item != null && !item.getType().isAir()) {
+                        block.getWorld().dropItemNaturally(block.getLocation(), item);
+                    }
+                }
+                BlockStorage.clearBlockInfo(block);
+            }
+        } else if (BlockStorage.hasBlockInfo(e.getBlock())) {
             e.setCancelled(true);
         }
     }