Fix BlockBreakEvent

MohistMC · Nov 29, 2024 · 3c65185 · 3c65185
1 parent 372ec50
commit 3c65185
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...erver/src/main/java/com/mohistmc/banner/mixin/server/level/MixinServerPlayerGameMode.java b/...erver/src/main/java/com/mohistmc/banner/mixin/server/level/MixinServerPlayerGameMode.java
@@ -288,7 +288,6 @@ public void handleBlockBreakAction(BlockPos blockposition, ServerboundPlayerActi
             }
 
             event = new BlockBreakEvent(bblock, this.player.getBukkitEntity());
-            banner$event.set(event);
 
             // Sword + Creative mode pre-cancel
             event.setCancelled(isSwordNoBreak);
@@ -304,6 +303,7 @@ public void handleBlockBreakAction(BlockPos blockposition, ServerboundPlayerActi
             }
 
             this.level.getCraftServer().getPluginManager().callEvent(event);
+            banner$event.set(event);
 
             if (event.isCancelled()) {
                 if (isSwordNoBreak) {
@@ -344,8 +344,9 @@ public void handleBlockBreakAction(BlockPos blockposition, ServerboundPlayerActi
 
         // Drop event experience
         if (this.level.removeBlock(pos, false) && banner$event.get() != null) {
-            this.level.getBlockState(pos).getBlock().popExperience(this.level, pos, banner$event.getAndSet(null).getExpToDrop());
+            this.level.getBlockState(pos).getBlock().popExperience(this.level, pos, banner$event.get().getExpToDrop());
         }
+        banner$event.set(null);
         cir.setReturnValue(true);
     }