fix: sculk sensor not triggering when placing/breaking furniture

oraxen · Jan 30, 2024 · 6cde0e8 · 6cde0e8
1 parent d54d50d
commit 6cde0e8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/core/src/main/java/io/th0rgal/oraxen/api/OraxenBlocks.java b/core/src/main/java/io/th0rgal/oraxen/api/OraxenBlocks.java
@@ -253,7 +253,7 @@ private static void removeNoteBlock(Block block, @Nullable Player player, boolea
             if (forceDrop || player.getGameMode() != GameMode.CREATIVE)
                 drop = noteBlockBreakEvent.getDrop();
 
-            player.getWorld().sendGameEvent(null, GameEvent.BLOCK_DESTROY, block.getLocation().toVector());
+            block.getWorld().sendGameEvent(null, GameEvent.BLOCK_DESTROY, block.getLocation().toVector());
         }
         if (drop != null) drop.spawns(block.getLocation(), itemInHand);
 
@@ -281,7 +281,7 @@ private static void removeStringBlock(Block block, @Nullable Player player, bool
             if (forceDrop || player.getGameMode() != GameMode.CREATIVE)
                 drop = wireBlockBreakEvent.getDrop();
 
-            player.getWorld().sendGameEvent(null, GameEvent.BLOCK_DESTROY, block.getLocation().toVector());
+            block.getWorld().sendGameEvent(null, GameEvent.BLOCK_DESTROY, block.getLocation().toVector());
         }
         if (drop != null) drop.spawns(block.getLocation(), itemInHand);
 

diff --git a/core/src/main/java/io/th0rgal/oraxen/api/OraxenFurniture.java b/core/src/main/java/io/th0rgal/oraxen/api/OraxenFurniture.java
@@ -163,6 +163,8 @@ public static boolean remove(@NotNull Location location, @Nullable Player player
             StorageMechanic storage = mechanic.getStorage();
             if (storage != null && (storage.isStorage() || storage.isShulker()))
                 storage.dropStorageContent(mechanic, baseEntity);
+
+            baseEntity.getWorld().sendGameEvent(null, GameEvent.BLOCK_DESTROY, baseEntity.getLocation().toVector());
         }
 
         if (mechanic.hasBarriers())
@@ -206,6 +208,7 @@ public static boolean remove(Entity baseEntity, @Nullable Player player, @Nullab
             StorageMechanic storage = mechanic.getStorage();
             if (storage != null && (storage.isStorage() || storage.isShulker()))
                 storage.dropStorageContent(mechanic, baseEntity);
+            baseEntity.getWorld().sendGameEvent(null, GameEvent.BLOCK_DESTROY, baseEntity.getLocation().toVector());
         }
 
         // Check if the mechanic or the baseEntity has barriers tied to it

diff --git a/.../main/java/io/th0rgal/oraxen/mechanics/provided/gameplay/furniture/FurnitureListener.java b/.../main/java/io/th0rgal/oraxen/mechanics/provided/gameplay/furniture/FurnitureListener.java
@@ -17,10 +17,7 @@
 import io.th0rgal.oraxen.utils.breaker.BreakerSystem;
 import io.th0rgal.oraxen.utils.breaker.HardnessModifier;
 import io.th0rgal.protectionlib.ProtectionLib;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Rotation;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.data.BlockData;
@@ -185,6 +182,7 @@ public void onFurniturePlace(final PlayerInteractEvent event) {
         if (!player.getGameMode().equals(GameMode.CREATIVE))
             item.setAmount(item.getAmount() - 1);
         event.setUseInteractedBlock(Event.Result.DENY);
+        baseEntity.getWorld().sendGameEvent(null, GameEvent.BLOCK_PLACE, baseEntity.getLocation().toVector());
     }
 
     private Block getTarget(Block placedAgainst, BlockFace blockFace) {

diff --git a/...va/io/th0rgal/oraxen/mechanics/provided/gameplay/noteblock/NoteBlockMechanicListener.java b/...va/io/th0rgal/oraxen/mechanics/provided/gameplay/noteblock/NoteBlockMechanicListener.java
@@ -471,7 +471,7 @@ public void makePlayerPlaceBlock(final Player player, final EquipmentSlot hand,
             target.setType(Material.AIR);
             BlockHelpers.correctAllBlockStates(placedAgainst, player, hand, face, item, newData);
         }
-        player.getWorld().sendGameEvent(null, GameEvent.BLOCK_PLACE, target.getLocation().toVector());
+        target.getWorld().sendGameEvent(null, GameEvent.BLOCK_PLACE, target.getLocation().toVector());
     }
 
     // Used to determine what instrument to use when playing a note depending on below block

diff --git a/...o/th0rgal/oraxen/mechanics/provided/gameplay/stringblock/StringBlockMechanicListener.java b/...o/th0rgal/oraxen/mechanics/provided/gameplay/stringblock/StringBlockMechanicListener.java
@@ -426,7 +426,7 @@ private void makePlayerPlaceBlock(final Player player, final EquipmentSlot hand,
             target.setType(Material.AIR);
             BlockHelpers.correctAllBlockStates(placedAgainst, player, hand, face, item, newData);
         }
-        player.getWorld().sendGameEvent(null, GameEvent.BLOCK_PLACE, target.getLocation().toVector());
+        target.getWorld().sendGameEvent(null, GameEvent.BLOCK_PLACE, target.getLocation().toVector());
     }
 
     public static void fixClientsideUpdate(Location loc) {