EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-31 03:25:28 +02:00
Code Issues Projects Releases Wiki Activity

prevent simulateBlockBreak from calling itself fixes #5188

Browse Source
This commit is contained in:
nossr50
2025-07-04 12:13:37 -07:00
parent 87277a0d6f
commit e6199c0a7a
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/com/gmail/nossr50/util/EventUtils.java
View File

@@ -64,6 +64,13 @@ import org.jetbrains.annotations.NotNull;
*/ */
public final class EventUtils { public final class EventUtils {
/**
* True when the current thread is already executing simulateBlockBreak().
* Thread-local so parallel Folia regions / async tasks are isolated.
*/
private static final ThreadLocal<Boolean> IN_FAKE_BREAK =
ThreadLocal.withInitial(() -> false);
/** /**
* This is a static utility class, therefore we don't want any instances of this class. Making * This is a static utility class, therefore we don't want any instances of this class. Making
* the constructor private prevents accidents like that. * the constructor private prevents accidents like that.
@@ -366,22 +373,31 @@ public final class EventUtils {
* @param eventType The type of event to signal to other plugins * @param eventType The type of event to signal to other plugins
* @return true if the event wasn't cancelled, false otherwise * @return true if the event wasn't cancelled, false otherwise
*/ */
public static boolean simulateBlockBreak(Block block, Player player, private static boolean simulateBlockBreak(Block block, Player player,
FakeBlockBreakEventType eventType) { FakeBlockBreakEventType eventType) {
PluginManager pluginManager = mcMMO.p.getServer().getPluginManager(); if (IN_FAKE_BREAK.get()) {
return true;
FakeBlockDamageEvent damageEvent = new FakeBlockDamageEvent(player, block, }
player.getInventory().getItemInMainHand(), true); IN_FAKE_BREAK.set(true);
pluginManager.callEvent(damageEvent);
try {
BlockBreakEvent fakeBlockBreakEvent = null; final PluginManager pluginManager = mcMMO.p.getServer().getPluginManager();
switch (eventType) { final FakeBlockDamageEvent damageEvent = new FakeBlockDamageEvent(player, block,
case FAKE -> fakeBlockBreakEvent = new FakeBlockBreakEvent(block, player); player.getInventory().getItemInMainHand(), true);
case TREE_FELLER -> fakeBlockBreakEvent = new TreeFellerBlockBreakEvent(block, player); pluginManager.callEvent(damageEvent);
final BlockBreakEvent fakeBlockBreakEvent = switch (eventType) {
case FAKE -> new FakeBlockBreakEvent(block, player);
case TREE_FELLER -> new TreeFellerBlockBreakEvent(block, player);
};
pluginManager.callEvent(fakeBlockBreakEvent);
return !damageEvent.isCancelled() && !fakeBlockBreakEvent.isCancelled();
} finally {
// always clear the flag
IN_FAKE_BREAK.set(false);
} }
pluginManager.callEvent(fakeBlockBreakEvent);
return !damageEvent.isCancelled() && !fakeBlockBreakEvent.isCancelled();
} }
public static void handlePartyTeleportEvent(Player teleportingPlayer, Player targetPlayer) { public static void handlePartyTeleportEvent(Player teleportingPlayer, Player targetPlayer) {