From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Date: Wed, 12 Jul 2023 17:38:26 -0400 Subject: [PATCH] Don't tick signs Minecraft now ticks signs in order to validate the playerWhoMayEdit field. This is a horrible idea, as this means that even waxed signs are ticked for essentially no reason. This moves the logic lazily onto the getter. == AT == private net.minecraft.world.level.block.entity.SignBlockEntity playerWhoMayEdit diff --git a/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java b/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java index 1af2e9eb1dcc8cf90afd38ea0fbe1b65396455f4..d94ea22e357e0606ceff9d1153d45e96ca3a0ffc 100644 --- a/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java +++ b/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java @@ -144,6 +144,6 @@ public class CeilingHangingSignBlock extends SignBlock { @Nullable @Override public BlockEntityTicker getTicker(Level world, BlockState state, BlockEntityType type) { - return createTickerHelper(type, BlockEntityType.HANGING_SIGN, SignBlockEntity::tick); + return null; // Paper } } diff --git a/src/main/java/net/minecraft/world/level/block/SignBlock.java b/src/main/java/net/minecraft/world/level/block/SignBlock.java index 0c1c6fbcf625da4a28514e0d040deb6c98ba9507..614777d15bcf4141a89d0a0f7bd880526c668ffd 100644 --- a/src/main/java/net/minecraft/world/level/block/SignBlock.java +++ b/src/main/java/net/minecraft/world/level/block/SignBlock.java @@ -207,6 +207,6 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo @Nullable @Override public BlockEntityTicker getTicker(Level world, BlockState state, BlockEntityType type) { - return createTickerHelper(type, BlockEntityType.SIGN, SignBlockEntity::tick); + return null; // Paper } } diff --git a/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java b/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java index 3a89fd4fe175b6e209548e5c98d18ce3fcff07b9..dd177d67fbb08508e634140a829b13a9f71327b9 100644 --- a/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java +++ b/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java @@ -167,6 +167,6 @@ public class WallHangingSignBlock extends SignBlock { @Nullable @Override public BlockEntityTicker getTicker(Level world, BlockState state, BlockEntityType type) { - return createTickerHelper(type, BlockEntityType.HANGING_SIGN, SignBlockEntity::tick); + return null; // Paper } } diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java index 9eea2982e92e9bc7a53962dc6b21de60f9e5a4c7..38cde466714e5663cd416b6afd5d2558e139ec09 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java @@ -367,6 +367,12 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C @Nullable public UUID getPlayerWhoMayEdit() { + // Paper start + if (this.hasLevel() && this.playerWhoMayEdit != null) { + // Manually invalidate the value lazily. + this.clearInvalidPlayerWhoMayEdit(this, this.getLevel(), this.playerWhoMayEdit); + } + // Paper end return this.playerWhoMayEdit; }