diff --git a/paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch b/paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
index 611ea70de17b..65613677ecf5 100644
--- a/paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
@@ -767,7 +767,7 @@
 +        final org.bukkit.event.player.PlayerTeleportEvent tpEvent;
 +        // Paper start - gateway-specific teleport event
 +        if (this.portalProcess != null && this.portalProcess.isSamePortal(((net.minecraft.world.level.block.EndGatewayBlock) net.minecraft.world.level.block.Blocks.END_GATEWAY)) && this.level().getBlockEntity(this.portalProcess.getEntryPosition()) instanceof net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity theEndGatewayBlockEntity) {
-+            tpEvent = new com.destroystokyo.paper.event.player.PlayerTeleportEndGatewayEvent(this.getBukkitEntity(), enter, exit.clone(), new org.bukkit.craftbukkit.block.CraftEndGateway(this.level().getWorld(), theEndGatewayBlockEntity));
++            tpEvent = new com.destroystokyo.paper.event.player.PlayerTeleportEndGatewayEvent(this.getBukkitEntity(), enter, exit.clone(), new org.bukkit.craftbukkit.block.CraftEndGateway(this.level().getWorld(), theEndGatewayBlockEntity, true));
 +        } else {
 +            tpEvent = new org.bukkit.event.player.PlayerTeleportEvent(this.getBukkitEntity(), enter, exit.clone(), transition.cause());
 +        }
diff --git a/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
index 8d843ac8b367..53cba304b594 100644
--- a/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
@@ -1497,7 +1497,7 @@
 +            // Paper start - gateway-specific teleport event
 +            final org.bukkit.event.entity.EntityTeleportEvent teleEvent;
 +            if (this.portalProcess != null && this.portalProcess.isSamePortal(((net.minecraft.world.level.block.EndGatewayBlock) Blocks.END_GATEWAY)) && this.level.getBlockEntity(this.portalProcess.getEntryPosition()) instanceof net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity theEndGatewayBlockEntity) {
-+                teleEvent = new com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent(this.getBukkitEntity(), this.getBukkitEntity().getLocation(), to, new org.bukkit.craftbukkit.block.CraftEndGateway(to.getWorld(), theEndGatewayBlockEntity));
++                teleEvent = new com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent(this.getBukkitEntity(), this.getBukkitEntity().getLocation(), to, new org.bukkit.craftbukkit.block.CraftEndGateway(to.getWorld(), theEndGatewayBlockEntity, true));
 +                teleEvent.callEvent();
 +            } else {
 +                teleEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTeleportEvent(this, to);
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
index 49bb995b25b3..9e1d2d9b97f3 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
@@ -19,8 +19,8 @@ public class CraftBanner extends CraftBlockEntityState<BannerBlockEntity> implem
     private DyeColor base;
     private List<Pattern> patterns;
 
-    public CraftBanner(World world, BannerBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftBanner(World world, BannerBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftBanner(CraftBanner state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java
index 7aa0cf0f2abd..9a8051ab9463 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java
@@ -12,8 +12,8 @@
 
 public class CraftBarrel extends CraftLootable<BarrelBlockEntity> implements Barrel {
 
-    public CraftBarrel(World world, BarrelBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftBarrel(World world, BarrelBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftBarrel(CraftBarrel state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
index 950cf04aab80..ddda4d152740 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
@@ -25,8 +25,8 @@
 
 public class CraftBeacon extends CraftBlockEntityState<BeaconBlockEntity> implements Beacon {
 
-    public CraftBeacon(World world, BeaconBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftBeacon(World world, BeaconBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftBeacon(CraftBeacon state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
index aa00185b64f2..5dfe29ac3205 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
@@ -16,8 +16,8 @@
 
 public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> implements Beehive {
 
-    public CraftBeehive(World world, BeehiveBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftBeehive(World world, BeehiveBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftBeehive(CraftBeehive state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBell.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBell.java
index 1ccab04f322a..a972ce61ed1e 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBell.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBell.java
@@ -14,8 +14,8 @@
 
 public class CraftBell extends CraftBlockEntityState<BellBlockEntity> implements Bell {
 
-    public CraftBell(World world, BellBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftBell(World world, BellBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftBell(CraftBell state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlastFurnace.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlastFurnace.java
index f1c1469fca69..d4adabd4967a 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlastFurnace.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlastFurnace.java
@@ -7,8 +7,8 @@
 
 public class CraftBlastFurnace extends CraftFurnace<BlastFurnaceBlockEntity> implements BlastFurnace {
 
-    public CraftBlastFurnace(World world, BlastFurnaceBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftBlastFurnace(World world, BlastFurnaceBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftBlastFurnace(CraftBlastFurnace state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
index 1ef1943c9934..ff4ba78611df 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -33,17 +33,16 @@ public abstract class CraftBlockEntityState<T extends BlockEntity> extends Craft
     private final T blockEntity;
     private final T snapshot;
     public boolean snapshotDisabled; // Paper
-    public static boolean DISABLE_SNAPSHOT = false; // Paper
 
-    public CraftBlockEntityState(World world, T blockEntity) {
+    public CraftBlockEntityState(World world, T blockEntity, boolean useSnapshot) {
         super(world, blockEntity.getBlockPos(), blockEntity.getBlockState());
 
         this.blockEntity = blockEntity;
 
         try { // Paper - Show blockstate location if we failed to read it
         // Paper start
-        this.snapshotDisabled = DISABLE_SNAPSHOT;
-        if (DISABLE_SNAPSHOT) {
+        this.snapshotDisabled = !useSnapshot;
+        if (!useSnapshot) {
             this.snapshot = this.blockEntity;
         } else {
             this.snapshot = this.createSnapshot(blockEntity);
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
index 063a4ad33d1c..a23840391801 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
@@ -4,7 +4,6 @@
 import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.Map;
-import java.util.function.BiFunction;
 import javax.annotation.Nullable;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.RegistryAccess;
@@ -37,43 +36,49 @@ public BlockStateFactory(Class<B> blockStateType) {
         // If the given block entity is not null, its position and block data are expected to match the given block position and block data.
         // In some situations, such as during chunk generation, the block entity's world may be null, even if the given world is not null.
         // If the block entity's world is not null, it is expected to match the given world.
-        public abstract B createBlockState(World world, BlockPos pos, net.minecraft.world.level.block.state.BlockState state, BlockEntity blockEntity);
+        public abstract B createBlockState(World world, BlockPos pos, net.minecraft.world.level.block.state.BlockState state, BlockEntity blockEntity, boolean useSnapshot);
+    }
+
+    @FunctionalInterface
+    private interface BlockEntityStateConstructor<T, B> {
+
+        B create(World world, T blockEntity, boolean useSnapshot);
     }
 
     private static class BlockEntityStateFactory<T extends BlockEntity, B extends CraftBlockEntityState<T>> extends BlockStateFactory<B> {
 
-        private final BiFunction<World, T, B> blockStateConstructor;
+        private final BlockEntityStateConstructor<T, B> blockStateConstructor;
         private final BlockEntityType<? extends T> blockEntityType;
 
-        protected BlockEntityStateFactory(Class<B> blockStateType, BiFunction<World, T, B> blockStateConstructor, BlockEntityType<? extends T> blockEntityType) {
+        protected BlockEntityStateFactory(Class<B> blockStateType, BlockEntityStateConstructor<T, B> blockStateConstructor, BlockEntityType<? extends T> blockEntityType) {
             super(blockStateType);
             this.blockStateConstructor = blockStateConstructor;
             this.blockEntityType = blockEntityType;
         }
 
         @Override
-        public final B createBlockState(World world, BlockPos pos, net.minecraft.world.level.block.state.BlockState state, BlockEntity blockEntity) {
+        public final B createBlockState(World world, BlockPos pos, net.minecraft.world.level.block.state.BlockState state, BlockEntity blockEntity, boolean useSnapshot) {
             if (world != null) {
                 Preconditions.checkState(blockEntity != null, "Block entity is null, asynchronous access? %s", CraftBlock.at(((CraftWorld) world).getHandle(), pos));
             } else if (blockEntity == null) {
                 blockEntity = this.createBlockEntity(pos, state);
             }
-            return this.createBlockState(world, (T) blockEntity);
+            return this.createBlockState(world, (T) blockEntity, useSnapshot);
         }
 
         private T createBlockEntity(BlockPos pos, net.minecraft.world.level.block.state.BlockState state) {
             return this.blockEntityType.create(pos, state);
         }
 
-        private B createBlockState(World world, T blockEntity) {
-            return this.blockStateConstructor.apply(world, blockEntity);
+        private B createBlockState(World world, T blockEntity, boolean useSnapshot) {
+            return this.blockStateConstructor.create(world, blockEntity, useSnapshot);
         }
     }
 
     private static final Map<Material, BlockStateFactory<?>> FACTORIES = new IdentityHashMap<>();
     private static final BlockStateFactory<?> DEFAULT_FACTORY = new BlockStateFactory<>(CraftBlockState.class) {
         @Override
-        public CraftBlockState createBlockState(World world, BlockPos pos, net.minecraft.world.level.block.state.BlockState state, BlockEntity blockEntity) {
+        public CraftBlockState createBlockState(World world, BlockPos pos, net.minecraft.world.level.block.state.BlockState state, BlockEntity blockEntity, boolean useSnapshot) {
             // Paper - revert upstream's revert of the block state changes. Block entities that have already had the block type set to AIR are still valid, upstream decided to ignore them
             Preconditions.checkState(blockEntity == null, "Unexpected BlockState for %s", CraftBlockType.minecraftToBukkit(state.getBlock()));
             return new CraftBlockState(world, pos, state);
@@ -146,7 +151,7 @@ private static void register(Material blockType, BlockStateFactory<?> factory) {
     private static <T extends BlockEntity, B extends CraftBlockEntityState<T>> void register(
             net.minecraft.world.level.block.entity.BlockEntityType<? extends T> blockEntityType,
             Class<B> blockStateType,
-            BiFunction<World, T, B> blockStateConstructor
+            BlockEntityStateConstructor<T, B> blockStateConstructor
     ) {
         BlockStateFactory<B> factory = new BlockEntityStateFactory<>(blockStateType, blockStateConstructor, blockEntityType);
         for (net.minecraft.world.level.block.Block block : blockEntityType.validBlocks) {
@@ -198,15 +203,9 @@ public static BlockState getBlockState(Block block, boolean useSnapshot) {
         BlockPos pos = craftBlock.getPosition();
         net.minecraft.world.level.block.state.BlockState state = craftBlock.getBlockState();
         BlockEntity blockEntity = craftBlock.getLevel().getBlockEntity(pos);
-        boolean prev = CraftBlockEntityState.DISABLE_SNAPSHOT;
-        CraftBlockEntityState.DISABLE_SNAPSHOT = !useSnapshot;
-        try {
-            CraftBlockState blockState = CraftBlockStates.getBlockState(world, pos, state, blockEntity);
-            blockState.setWorldHandle(craftBlock.getLevel()); // Inject the block's level accessor
-            return blockState;
-        } finally {
-            CraftBlockEntityState.DISABLE_SNAPSHOT = prev;
-        }
+        CraftBlockState blockState = CraftBlockStates.getBlockState(world, pos, state, blockEntity, useSnapshot);
+        blockState.setWorldHandle(craftBlock.getLevel()); // Inject the block's level accessor
+        return blockState;
     }
 
     @Deprecated
@@ -240,8 +239,12 @@ public static BlockState getBlockState(RegistryAccess registry, BlockPos pos, ne
         return CraftBlockStates.getBlockState(null, pos, state, blockEntity);
     }
 
-    // See BlockStateFactory#createBlockState(World, BlockPos, BlockState, BlockEntity)
+    // See BlockStateFactory#createBlockState(World, BlockPos, BlockState, BlockEntity, boolean)
     public static CraftBlockState getBlockState(World world, BlockPos pos, net.minecraft.world.level.block.state.BlockState state, BlockEntity blockEntity) {
+        return CraftBlockStates.getBlockState(world, pos, state, blockEntity, true);
+    }
+
+    public static CraftBlockState getBlockState(World world, BlockPos pos, net.minecraft.world.level.block.state.BlockState state, BlockEntity blockEntity, boolean useSnapshot) {
         Material material = CraftBlockType.minecraftToBukkit(state.getBlock());
         BlockStateFactory<?> factory;
         // For some types of BlockEntity blocks (e.g. moving pistons), Minecraft may in some situations (e.g. when using Block#setType or the
@@ -251,7 +254,7 @@ public static CraftBlockState getBlockState(World world, BlockPos pos, net.minec
         } else {
             factory = CraftBlockStates.getFactory(material, blockEntity != null ? blockEntity.getType() : null); // Paper
         }
-        return factory.createBlockState(world, pos, state, blockEntity);
+        return factory.createBlockState(world, pos, state, blockEntity, useSnapshot);
     }
 
     public static boolean isBlockEntityOptional(Material material) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBrewingStand.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBrewingStand.java
index ec57e402a8c1..192a8945b447 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBrewingStand.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBrewingStand.java
@@ -9,8 +9,8 @@
 
 public class CraftBrewingStand extends CraftContainer<BrewingStandBlockEntity> implements BrewingStand {
 
-    public CraftBrewingStand(World world, BrewingStandBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftBrewingStand(World world, BrewingStandBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftBrewingStand(CraftBrewingStand state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBrushableBlock.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBrushableBlock.java
index 6e3933aa0d6d..cb413a190598 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBrushableBlock.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBrushableBlock.java
@@ -11,8 +11,8 @@
 
 public class CraftBrushableBlock extends CraftBlockEntityState<BrushableBlockEntity> implements BrushableBlock {
 
-    public CraftBrushableBlock(World world, BrushableBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftBrushableBlock(World world, BrushableBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftBrushableBlock(CraftBrushableBlock state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCalibratedSculkSensor.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCalibratedSculkSensor.java
index 7ef912b6ae92..1800f2a1e50a 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCalibratedSculkSensor.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCalibratedSculkSensor.java
@@ -7,8 +7,8 @@
 
 public class CraftCalibratedSculkSensor extends CraftSculkSensor<CalibratedSculkSensorBlockEntity> implements CalibratedSculkSensor {
 
-    public CraftCalibratedSculkSensor(World world, CalibratedSculkSensorBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftCalibratedSculkSensor(World world, CalibratedSculkSensorBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftCalibratedSculkSensor(CraftCalibratedSculkSensor state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java
index 65771766a089..07b8337fea2e 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java
@@ -11,8 +11,8 @@
 
 public class CraftCampfire extends CraftBlockEntityState<CampfireBlockEntity> implements Campfire {
 
-    public CraftCampfire(World world, CampfireBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftCampfire(World world, CampfireBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftCampfire(CraftCampfire state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
index 904cfffdded1..7a5dbab2a979 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
@@ -19,8 +19,8 @@
 
 public class CraftChest extends CraftLootable<ChestBlockEntity> implements Chest {
 
-    public CraftChest(World world, ChestBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftChest(World world, ChestBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftChest(CraftChest state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftChiseledBookshelf.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftChiseledBookshelf.java
index 6f6012648d2a..8641067502d3 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftChiseledBookshelf.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftChiseledBookshelf.java
@@ -14,8 +14,8 @@
 
 public class CraftChiseledBookshelf extends CraftBlockEntityState<ChiseledBookShelfBlockEntity> implements ChiseledBookshelf {
 
-    public CraftChiseledBookshelf(World world, ChiseledBookShelfBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftChiseledBookshelf(World world, ChiseledBookShelfBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftChiseledBookshelf(CraftChiseledBookshelf state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java
index 170606047e8a..63281f943a70 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java
@@ -8,8 +8,8 @@
 
 public class CraftCommandBlock extends CraftBlockEntityState<CommandBlockEntity> implements CommandBlock, io.papermc.paper.commands.PaperCommandBlockHolder {
 
-    public CraftCommandBlock(World world, CommandBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftCommandBlock(World world, CommandBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftCommandBlock(CraftCommandBlock state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftComparator.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftComparator.java
index 89751e8f1754..55c25301c501 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftComparator.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftComparator.java
@@ -7,8 +7,8 @@
 
 public class CraftComparator extends CraftBlockEntityState<ComparatorBlockEntity> implements Comparator {
 
-    public CraftComparator(World world, ComparatorBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftComparator(World world, ComparatorBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftComparator(CraftComparator state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
index 997dafd7d3c3..30c25b9d6859 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
@@ -16,8 +16,8 @@
 
 public class CraftConduit extends CraftBlockEntityState<ConduitBlockEntity> implements Conduit {
 
-    public CraftConduit(World world, ConduitBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftConduit(World world, ConduitBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftConduit(CraftConduit state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftContainer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftContainer.java
index 20a3485a3818..82f27b42b415 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftContainer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftContainer.java
@@ -17,8 +17,8 @@
 
 public abstract class CraftContainer<T extends BaseContainerBlockEntity> extends CraftBlockEntityState<T> implements Container {
 
-    public CraftContainer(World world, T blockEntity) {
-        super(world, blockEntity);
+    public CraftContainer(World world, T blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftContainer(CraftContainer<T> state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCopperGolemStatue.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCopperGolemStatue.java
index 52c4ead60f0e..a6d3cb9002c4 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCopperGolemStatue.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCopperGolemStatue.java
@@ -6,8 +6,8 @@
 import org.bukkit.block.CopperGolemStatue;
 
 public class CraftCopperGolemStatue extends CraftBlockEntityState<CopperGolemStatueBlockEntity> implements CopperGolemStatue {
-    public CraftCopperGolemStatue(World world, CopperGolemStatueBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftCopperGolemStatue(World world, CopperGolemStatueBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftCopperGolemStatue(CraftCopperGolemStatue state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCrafter.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCrafter.java
index 834ec337dc50..8134f5efb4a2 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCrafter.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCrafter.java
@@ -10,8 +10,8 @@
 
 public class CraftCrafter extends CraftLootable<CrafterBlockEntity> implements Crafter {
 
-    public CraftCrafter(World world, CrafterBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftCrafter(World world, CrafterBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftCrafter(CraftCrafter state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCreakingHeart.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCreakingHeart.java
index 569378e7913a..feb15ef76070 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCreakingHeart.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCreakingHeart.java
@@ -15,8 +15,8 @@
 @NullMarked
 public class CraftCreakingHeart extends CraftBlockEntityState<CreakingHeartBlockEntity> implements CreakingHeart {
 
-    public CraftCreakingHeart(World world, CreakingHeartBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftCreakingHeart(World world, CreakingHeartBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftCreakingHeart(CraftCreakingHeart state, @Nullable Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
index b824e8527bac..b1544f5e32d2 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
@@ -34,8 +34,8 @@
 
 public class CraftCreatureSpawner extends CraftBlockEntityState<SpawnerBlockEntity> implements CreatureSpawner, org.bukkit.craftbukkit.spawner.PaperSharedSpawnerLogic { // Paper - more spawner API
 
-    public CraftCreatureSpawner(World world, SpawnerBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftCreatureSpawner(World world, SpawnerBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftCreatureSpawner(CraftCreatureSpawner state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDaylightDetector.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDaylightDetector.java
index bc39a3a4e127..da97a2c94c96 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDaylightDetector.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDaylightDetector.java
@@ -7,8 +7,8 @@
 
 public class CraftDaylightDetector extends CraftBlockEntityState<DaylightDetectorBlockEntity> implements DaylightDetector {
 
-    public CraftDaylightDetector(World world, DaylightDetectorBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftDaylightDetector(World world, DaylightDetectorBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftDaylightDetector(CraftDaylightDetector state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDecoratedPot.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDecoratedPot.java
index 444f543e6964..32560e1def86 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDecoratedPot.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDecoratedPot.java
@@ -21,8 +21,8 @@
 
 public class CraftDecoratedPot extends CraftBlockEntityState<DecoratedPotBlockEntity> implements DecoratedPot {
 
-    public CraftDecoratedPot(World world, DecoratedPotBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftDecoratedPot(World world, DecoratedPotBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftDecoratedPot(CraftDecoratedPot state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
index 24d6a5659b3d..ac72a2242944 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
@@ -16,8 +16,8 @@
 
 public class CraftDispenser extends CraftLootable<DispenserBlockEntity> implements Dispenser {
 
-    public CraftDispenser(World world, DispenserBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftDispenser(World world, DispenserBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftDispenser(CraftDispenser state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDropper.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDropper.java
index 4c97a285216f..6575caa5cc03 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDropper.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftDropper.java
@@ -14,8 +14,8 @@
 
 public class CraftDropper extends CraftLootable<DropperBlockEntity> implements Dropper {
 
-    public CraftDropper(World world, DropperBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftDropper(World world, DropperBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftDropper(CraftDropper state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEnchantingTable.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEnchantingTable.java
index cb59004a1816..595f59c8ba2b 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEnchantingTable.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEnchantingTable.java
@@ -8,8 +8,8 @@
 
 public class CraftEnchantingTable extends CraftBlockEntityState<EnchantingTableBlockEntity> implements EnchantingTable {
 
-    public CraftEnchantingTable(World world, EnchantingTableBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftEnchantingTable(World world, EnchantingTableBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftEnchantingTable(CraftEnchantingTable state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java
index 90aaf37320d0..eb2e98bdea23 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java
@@ -10,8 +10,8 @@
 
 public class CraftEndGateway extends CraftBlockEntityState<TheEndGatewayBlockEntity> implements EndGateway {
 
-    public CraftEndGateway(World world, TheEndGatewayBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftEndGateway(World world, TheEndGatewayBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftEndGateway(CraftEndGateway state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEndPortal.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEndPortal.java
index 3df928e32410..9b1452bc0a12 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEndPortal.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEndPortal.java
@@ -6,8 +6,8 @@
 
 public class CraftEndPortal extends CraftBlockEntityState<TheEndPortalBlockEntity> {
 
-    public CraftEndPortal(World world, TheEndPortalBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftEndPortal(World world, TheEndPortalBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftEndPortal(CraftEndPortal state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
index 2a9243e416bb..5fd8d267818a 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
@@ -9,8 +9,8 @@
 
 public class CraftEnderChest extends CraftBlockEntityState<EnderChestBlockEntity> implements EnderChest {
 
-    public CraftEnderChest(World world, EnderChestBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftEnderChest(World world, EnderChestBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftEnderChest(CraftEnderChest state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
index 4f5de787f44c..c9c3aea23d4d 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
@@ -18,8 +18,8 @@
 
 public abstract class CraftFurnace<T extends AbstractFurnaceBlockEntity> extends CraftContainer<T> implements Furnace {
 
-    public CraftFurnace(World world, T blockEntity) {
-        super(world, blockEntity);
+    public CraftFurnace(World world, T blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftFurnace(CraftFurnace<T> state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftFurnaceFurnace.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftFurnaceFurnace.java
index 981dab6ed1ad..cbb3d93b81ed 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftFurnaceFurnace.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftFurnaceFurnace.java
@@ -6,8 +6,8 @@
 
 public class CraftFurnaceFurnace extends CraftFurnace<FurnaceBlockEntity> {
 
-    public CraftFurnaceFurnace(World world, FurnaceBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftFurnaceFurnace(World world, FurnaceBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftFurnaceFurnace(CraftFurnaceFurnace state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftHangingSign.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftHangingSign.java
index 4380623f4ef3..083876226784 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftHangingSign.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftHangingSign.java
@@ -7,8 +7,8 @@
 
 public class CraftHangingSign extends CraftSign<HangingSignBlockEntity> implements HangingSign {
 
-    public CraftHangingSign(World world, HangingSignBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftHangingSign(World world, HangingSignBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftHangingSign(CraftHangingSign state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
index 83f05691cd19..3fd39229d8e6 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
@@ -9,8 +9,8 @@
 
 public class CraftHopper extends CraftLootable<HopperBlockEntity> implements Hopper {
 
-    public CraftHopper(World world, HopperBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftHopper(World world, HopperBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftHopper(CraftHopper state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftJigsaw.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftJigsaw.java
index 1c9d54fc516f..dc8cb89eb226 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftJigsaw.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftJigsaw.java
@@ -7,8 +7,8 @@
 
 public class CraftJigsaw extends CraftBlockEntityState<JigsawBlockEntity> implements Jigsaw {
 
-    public CraftJigsaw(World world, JigsawBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftJigsaw(World world, JigsawBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftJigsaw(CraftJigsaw state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java
index fb436888470e..70bbb20f5efb 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java
@@ -16,8 +16,8 @@
 
 public class CraftJukebox extends CraftBlockEntityState<JukeboxBlockEntity> implements Jukebox {
 
-    public CraftJukebox(World world, JukeboxBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftJukebox(World world, JukeboxBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftJukebox(CraftJukebox state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftLectern.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftLectern.java
index 925733559a4b..4eef25a8380a 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftLectern.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftLectern.java
@@ -11,8 +11,8 @@
 
 public class CraftLectern extends CraftBlockEntityState<LecternBlockEntity> implements Lectern {
 
-    public CraftLectern(World world, LecternBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftLectern(World world, LecternBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftLectern(CraftLectern state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
index 1e4845f114b1..d205b23f15dd 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
@@ -10,8 +10,8 @@
 
 public abstract class CraftLootable<T extends RandomizableContainerBlockEntity> extends CraftContainer<T> implements Nameable, Lootable, com.destroystokyo.paper.loottable.PaperLootableBlockInventory { // Paper
 
-    public CraftLootable(World world, T blockEntity) {
-        super(world, blockEntity);
+    public CraftLootable(World world, T blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftLootable(CraftLootable<T> state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
index 2beb8ec07de1..e130d9172363 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
@@ -6,8 +6,8 @@
 
 public class CraftMovingPiston extends CraftBlockEntityState<PistonMovingBlockEntity> implements io.papermc.paper.block.MovingPiston { // Paper - Add Moving Piston API
 
-    public CraftMovingPiston(World world, PistonMovingBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftMovingPiston(World world, PistonMovingBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftMovingPiston(CraftMovingPiston state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftPotentSulfur.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftPotentSulfur.java
index d27f4bb9f793..6706f3a8946b 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftPotentSulfur.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftPotentSulfur.java
@@ -7,8 +7,8 @@
 
 public class CraftPotentSulfur extends CraftBlockEntityState<PotentSulfurBlockEntity> implements PotentSulfur {
 
-    public CraftPotentSulfur(World world, PotentSulfurBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftPotentSulfur(World world, PotentSulfurBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftPotentSulfur(CraftPotentSulfur state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkCatalyst.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkCatalyst.java
index e925f73e96e2..ed34ccdcdde2 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkCatalyst.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkCatalyst.java
@@ -10,8 +10,8 @@
 
 public class CraftSculkCatalyst extends CraftBlockEntityState<SculkCatalystBlockEntity> implements SculkCatalyst {
 
-    public CraftSculkCatalyst(World world, SculkCatalystBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftSculkCatalyst(World world, SculkCatalystBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftSculkCatalyst(CraftSculkCatalyst state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java
index 8f31eb16989a..fa6432d7d04b 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java
@@ -8,8 +8,8 @@
 
 public class CraftSculkSensor<T extends SculkSensorBlockEntity> extends CraftBlockEntityState<T> implements SculkSensor {
 
-    public CraftSculkSensor(World world, T blockEntity) {
-        super(world, blockEntity);
+    public CraftSculkSensor(World world, T blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftSculkSensor(CraftSculkSensor<T> state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkShrieker.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkShrieker.java
index 98bdb2dffce3..ee1859da77a1 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkShrieker.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkShrieker.java
@@ -10,8 +10,8 @@
 
 public class CraftSculkShrieker extends CraftBlockEntityState<SculkShriekerBlockEntity> implements SculkShrieker {
 
-    public CraftSculkShrieker(World world, SculkShriekerBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftSculkShrieker(World world, SculkShriekerBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftSculkShrieker(CraftSculkShrieker state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftShelf.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftShelf.java
index e731b3fe7ce0..5c84948907d9 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftShelf.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftShelf.java
@@ -9,8 +9,8 @@
 
 public class CraftShelf extends CraftBlockEntityState<ShelfBlockEntity> implements Shelf {
 
-    public CraftShelf(World world, ShelfBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftShelf(World world, ShelfBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftShelf(CraftShelf state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
index 2e46d8831e86..1ae64fa6fabc 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
@@ -13,8 +13,8 @@
 
 public class CraftShulkerBox extends CraftLootable<ShulkerBoxBlockEntity> implements ShulkerBox {
 
-    public CraftShulkerBox(World world, ShulkerBoxBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftShulkerBox(World world, ShulkerBoxBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftShulkerBox(CraftShulkerBox state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
index 3b1b60822b9b..23fb24d42c5a 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
@@ -26,8 +26,8 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
     private @MonotonicNonNull CraftSignSide front;
     private @MonotonicNonNull CraftSignSide back;
 
-    public CraftSign(World world, T blockEntity) {
-        super(world, blockEntity);
+    public CraftSign(World world, T blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftSign(CraftSign<T> state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
index 7329b504cf54..9fd65a76a91c 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
@@ -37,8 +37,8 @@ public class CraftSkull extends CraftBlockEntityState<SkullBlockEntity> implemen
     private static final int MAX_OWNER_LENGTH = 16;
     private ResolvableProfile profile;
 
-    public CraftSkull(World world, SkullBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftSkull(World world, SkullBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftSkull(CraftSkull state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSmoker.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSmoker.java
index b09a1a8dbafb..bf355c9cc065 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSmoker.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSmoker.java
@@ -7,8 +7,8 @@
 
 public class CraftSmoker extends CraftFurnace<SmokerBlockEntity> implements Smoker {
 
-    public CraftSmoker(World world, SmokerBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftSmoker(World world, SmokerBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftSmoker(CraftSmoker state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftStructureBlock.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftStructureBlock.java
index ea846890eae1..ae636be9b9d0 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftStructureBlock.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftStructureBlock.java
@@ -20,8 +20,8 @@ public class CraftStructureBlock extends CraftBlockEntityState<StructureBlockEnt
 
     private static final int MAX_SIZE = 48;
 
-    public CraftStructureBlock(World world, StructureBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftStructureBlock(World world, StructureBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftStructureBlock(CraftStructureBlock state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftTestBlock.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftTestBlock.java
index 85e02693aae2..0730f75b26b7 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftTestBlock.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftTestBlock.java
@@ -7,8 +7,8 @@
 
 public class CraftTestBlock extends CraftBlockEntityState<TestBlockEntity> implements TestBlock {
 
-    public CraftTestBlock(World world, TestBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftTestBlock(World world, TestBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftTestBlock(CraftTestBlock state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftTestInstanceBlock.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftTestInstanceBlock.java
index 3a4edb0f2c6d..e7139a347ac2 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftTestInstanceBlock.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftTestInstanceBlock.java
@@ -7,8 +7,8 @@
 
 public class CraftTestInstanceBlock extends CraftBlockEntityState<TestInstanceBlockEntity> implements TestInstanceBlock {
 
-    public CraftTestInstanceBlock(World world, TestInstanceBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftTestInstanceBlock(World world, TestInstanceBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftTestInstanceBlock(CraftTestInstanceBlock state, Location location) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftTrialSpawner.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftTrialSpawner.java
index ae5f1904c8e6..4d8169ae4d50 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftTrialSpawner.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftTrialSpawner.java
@@ -21,8 +21,8 @@ public class CraftTrialSpawner extends CraftBlockEntityState<TrialSpawnerBlockEn
     private final CraftTrialSpawnerConfiguration normalConfig;
     private final CraftTrialSpawnerConfiguration ominousConfig;
 
-    public CraftTrialSpawner(World world, TrialSpawnerBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftTrialSpawner(World world, TrialSpawnerBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
         this.normalConfig = new CraftTrialSpawnerConfiguration(blockEntity.getTrialSpawner().normalConfig(), this.getSnapshot());
         this.ominousConfig = new CraftTrialSpawnerConfiguration(blockEntity.getTrialSpawner().ominousConfig(), this.getSnapshot());
     }
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftVault.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftVault.java
index a416ed3aeb53..55ceba54568e 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftVault.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftVault.java
@@ -23,8 +23,8 @@
 @NullMarked
 public class CraftVault extends CraftBlockEntityState<VaultBlockEntity> implements Vault {
 
-    public CraftVault(World world, VaultBlockEntity blockEntity) {
-        super(world, blockEntity);
+    public CraftVault(World world, VaultBlockEntity blockEntity, boolean useSnapshot) {
+        super(world, blockEntity, useSnapshot);
     }
 
     protected CraftVault(CraftVault state, @Nullable Location location) {