diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/TrapDoorBlockBehavior.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/TrapDoorBlockBehavior.java
index a4b3b8159..2b6648585 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/TrapDoorBlockBehavior.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/TrapDoorBlockBehavior.java
@@ -199,7 +199,7 @@ public class TrapDoorBlockBehavior extends WaterLoggedBlockBehavior {
 
     private void toggle(ImmutableBlockState state, World world, BlockPos pos, @Nullable Player player) {
         ImmutableBlockState newState = state.cycle(this.openProperty);
-        FastNMS.INSTANCE.method$LevelWriter$setBlock(world.serverWorld(), LocationUtils.toBlockPos(pos), newState.customBlockState().handle(), UpdateOption.Flags.UPDATE_CLIENTS);
+        FastNMS.INSTANCE.method$LevelWriter$setBlock(world.serverWorld(), LocationUtils.toBlockPos(pos), newState.customBlockState().handle(), UpdateOption.UPDATE_ALL.flags());
         boolean open = newState.get(this.openProperty);
         ((org.bukkit.World) world.platformWorld()).sendGameEvent(
                 player != null ? (org.bukkit.entity.Player) player.platformPlayer() : null,
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/listener/ItemEventListener.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/listener/ItemEventListener.java
index 3b67a8fc2..2ddebfe37 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/listener/ItemEventListener.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/listener/ItemEventListener.java
@@ -170,13 +170,13 @@ public class ItemEventListener implements Listener {
                 if (immutableBlockState.behavior() instanceof AbstractBlockBehavior behavior) {
                     InteractionResult result = behavior.useOnBlock(useOnContext, immutableBlockState);
                     if (result == InteractionResult.SUCCESS_AND_CANCEL) {
-                        serverPlayer.updateLastSuccessfulInteractionTick(serverPlayer.lastSuccessfulInteractionTick());
+                        serverPlayer.updateLastSuccessfulInteractionTick(serverPlayer.gameTicks());
                         event.setCancelled(true);
                         return;
                     }
                     if (result != InteractionResult.PASS) {
                         if (result == InteractionResult.SUCCESS) {
-                            serverPlayer.updateLastSuccessfulInteractionTick(serverPlayer.lastSuccessfulInteractionTick());
+                            serverPlayer.updateLastSuccessfulInteractionTick(serverPlayer.gameTicks());
                         }
                         return;
                     }