Merge remote-tracking branch 'upstream/master'

SlimefunGuguProject · Mar 10, 2022 · 6d1a500 · 6d1a500
2 parents 5b7cd06 + f8db965
commit 6d1a500
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -66,6 +66,7 @@
 * Fixed "LogBlock" integration
 * Fixed "Lands" integration
 * Fixed #3133
+* Fixed #3483
 
 ## Release Candidate 30 (31 Dec 2021)
 https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#30

diff --git a/...java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MiddleClickListener.java b/...java/io/github/thebusybiscuit/slimefun4/implementation/listeners/MiddleClickListener.java
@@ -46,7 +46,8 @@ public void onInventoryCreativeEvent(InventoryCreativeEvent e) {
             // get the block the player is looking at for later
             Block b = player.getTargetBlockExact(5);
 
-            if (!isActualMiddleClick(e, b)) {
+            // Fixes: #3483
+            if (b == null || !isActualMiddleClick(e, b)) {
                 return;
             }