2022-09-23 07:35:15 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
|
|
|
|
Date: Sun, 7 Aug 2022 22:16:36 +0200
|
|
|
|
Subject: [PATCH] Call BlockPhysicsEvent more often
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
|
2024-01-18 15:56:25 +01:00
|
|
|
index 7d54abc2553f4b319df4d533a0b689c1807b6102..395bb163fb1d62dd2e6949e1146c337c0bbc626f 100644
|
2022-09-23 07:35:15 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
|
|
|
|
@@ -119,7 +119,27 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
|
|
|
|
public boolean runNext(Level world) {
|
|
|
|
BlockPos blockPos = this.sourcePos.relative(NeighborUpdater.UPDATE_ORDER[this.idx++]);
|
|
|
|
BlockState blockState = world.getBlockState(blockPos);
|
2023-09-22 17:35:51 +02:00
|
|
|
- NeighborUpdater.executeUpdate(world, blockState, blockPos, this.sourceBlock, this.sourcePos, false);
|
2024-01-18 15:56:25 +01:00
|
|
|
+ // Paper start - Call BlockPhysicsEvent
|
2022-09-23 07:35:15 +02:00
|
|
|
+ try {
|
|
|
|
+ boolean cancelled = false;
|
|
|
|
+ org.bukkit.craftbukkit.CraftWorld cworld = world.getWorld();
|
|
|
|
+ if (cworld != null) {
|
|
|
|
+ org.bukkit.event.block.BlockPhysicsEvent event = new org.bukkit.event.block.BlockPhysicsEvent(
|
|
|
|
+ org.bukkit.craftbukkit.block.CraftBlock.at(world, blockPos),
|
|
|
|
+ org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(blockState),
|
|
|
|
+ org.bukkit.craftbukkit.block.CraftBlock.at(world, sourcePos));
|
|
|
|
+
|
|
|
|
+ if (!event.callEvent()) {
|
|
|
|
+ cancelled = true;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (!cancelled) { // continue to check for adjacent block (increase idx)
|
2023-09-22 17:35:51 +02:00
|
|
|
+ NeighborUpdater.executeUpdate(world, blockState, blockPos, this.sourceBlock, this.sourcePos, false);
|
2022-09-23 07:35:15 +02:00
|
|
|
+ }
|
|
|
|
+ } catch (StackOverflowError ex) {
|
|
|
|
+ world.lastPhysicsProblem = new BlockPos(blockPos);
|
|
|
|
+ }
|
2024-01-18 15:56:25 +01:00
|
|
|
+ // Paper end - Call BlockPhysicsEvent
|
2022-09-23 07:35:15 +02:00
|
|
|
if (this.idx < NeighborUpdater.UPDATE_ORDER.length && NeighborUpdater.UPDATE_ORDER[this.idx] == this.skipDirection) {
|
|
|
|
++this.idx;
|
|
|
|
}
|