1e38743b1d
Also fixes build as a result of an upstream force push --- work/Bukkit Submodule work/Bukkit 217dc08d..d13fdf8c: > SPIGOT-4637: Add source block to BlockPhysicsEvent. --- work/CraftBukkit Submodule work/CraftBukkit acbba8ba..cb98c6ea: > Fix line endings in CraftDefaultPermissions > SPIGOT-4637: Add source block to BlockPhysicsEvent. --- work/Spigot Submodule work/Spigot 75ee78a0c...4165cd8f4 (commits not present) > (Manually Added) - Appears to be a result of an upstream force push > (Manually Added) - Changed: SPIGOT-4636: Add creative mode NBT permissions
27 lines
1 KiB
Diff
27 lines
1 KiB
Diff
From 47b023d5aea541dfa645790eec0d9f951e47581f Mon Sep 17 00:00:00 2001
|
|
From: Matthew Miller <mnmiller1@me.com>
|
|
Date: Fri, 5 Oct 2018 15:46:46 +1000
|
|
Subject: [PATCH] Don't update snapshot blockstates
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
|
index 082a1b6e2..2b78fff9f 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
|
@@ -131,7 +131,11 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
|
|
TileEntity tile = getTileEntityFromWorld();
|
|
|
|
if (isApplicable(tile)) {
|
|
- applyTo(tileEntityClass.cast(tile));
|
|
+ // Paper start
|
|
+ if (!snapshotDisabled) {
|
|
+ applyTo(tileEntityClass.cast(tile));
|
|
+ }
|
|
+ // Paper end
|
|
tile.update();
|
|
}
|
|
}
|
|
--
|
|
2.20.1
|
|
|