fix(block): SlimefunPlaceEvent is invalid

SlimefunGuguProject · Apr 2, 2024 · d549937 · d549937
1 parent d6f1a90
commit d549937
Showing 1 changed file with 12 additions and 4 deletions.
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
@@ -143,10 +143,18 @@ public void onBlockPlace(BlockPlaceEvent e) {
                 var placeEvent = new SlimefunBlockPlaceEvent(e.getPlayer(), item, e.getBlock(), sfItem);
                 Bukkit.getPluginManager().callEvent(placeEvent);
 
-                Slimefun.getDatabaseManager()
-                        .getBlockDataController()
-                        .createBlock(e.getBlock().getLocation(), sfItem.getId());
-                sfItem.callItemHandler(BlockPlaceHandler.class, handler -> handler.onPlayerPlace(e));
+                if (placeEvent.isCancelled()) {
+                    e.setCancelled(true);
+                } else {
+                    if (Slimefun.getBlockDataService().isTileEntity(e.getBlock().getType())) {
+                        Slimefun.getBlockDataService().setBlockData(e.getBlock(), sfItem.getId());
+                    }
+
+                    Slimefun.getDatabaseManager()
+                            .getBlockDataController()
+                            .createBlock(e.getBlock().getLocation(), sfItem.getId());
+                    sfItem.callItemHandler(BlockPlaceHandler.class, handler -> handler.onPlayerPlace(e));
+                }
             }
         }
     }