aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/unapplied/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/unapplied/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch')
-rw-r--r--patches/unapplied/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch77
1 files changed, 77 insertions, 0 deletions
diff --git a/patches/unapplied/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch
new file mode 100644
index 0000000000..3c5725587c
--- /dev/null
+++ b/patches/unapplied/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -0,0 +1,77 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <[email protected]>
+Date: Sun, 11 Nov 2018 21:01:09 +0000
+Subject: [PATCH] Don't allow digging into unloaded chunks
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+index 4c8189a2a7edea824545a24dccb376b8eceac001..4623c8acd125dff4919c4e2045b848310d785da5 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+@@ -122,8 +122,8 @@ public class ServerPlayerGameMode {
+ BlockState iblockdata;
+
+ if (this.hasDelayedDestroy) {
+- iblockdata = this.level.getBlockState(this.delayedDestroyPos);
+- if (iblockdata.isAir()) {
++ iblockdata = this.level.getBlockStateIfLoaded(this.delayedDestroyPos); // Paper - Don't allow digging into unloaded chunks
++ if (iblockdata == null || iblockdata.isAir()) { // Paper - Don't allow digging into unloaded chunks
+ this.hasDelayedDestroy = false;
+ } else {
+ float f = this.incrementDestroyProgress(iblockdata, this.delayedDestroyPos, this.delayedTickStart);
+@@ -134,7 +134,13 @@ public class ServerPlayerGameMode {
+ }
+ }
+ } else if (this.isDestroyingBlock) {
+- iblockdata = this.level.getBlockState(this.destroyPos);
++ // Paper start - Don't allow digging into unloaded chunks; don't want to do same logic as above, return instead
++ iblockdata = this.level.getBlockStateIfLoaded(this.destroyPos);
++ if (iblockdata == null) {
++ this.isDestroyingBlock = false;
++ return;
++ }
++ // Paper end - Don't allow digging into unloaded chunks
+ if (iblockdata.isAir()) {
+ this.level.destroyBlockProgress(this.player.getId(), this.destroyPos, -1);
+ this.lastSentState = -1;
+@@ -163,6 +169,7 @@ public class ServerPlayerGameMode {
+
+ public void handleBlockBreakAction(BlockPos pos, ServerboundPlayerActionPacket.Action action, Direction direction, int worldHeight, int sequence) {
+ if (!this.player.canInteractWithBlock(pos, 1.0D)) {
++ if (true) return; // Paper - Don't allow digging into unloaded chunks; Don't notify if unreasonably far away
+ this.debugLogging(pos, false, sequence, "too far");
+ } else if (pos.getY() > worldHeight) {
+ this.player.connection.send(new ClientboundBlockUpdatePacket(pos, this.level.getBlockState(pos)));
+@@ -305,10 +312,12 @@ public class ServerPlayerGameMode {
+ this.debugLogging(pos, true, sequence, "stopped destroying");
+ } else if (action == ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK) {
+ this.isDestroyingBlock = false;
+- if (!Objects.equals(this.destroyPos, pos)) {
++ if (!Objects.equals(this.destroyPos, pos) && !BlockPos.ZERO.equals(this.destroyPos)) { // Paper
+ ServerPlayerGameMode.LOGGER.debug("Mismatch in destroy block pos: {} {}", this.destroyPos, pos); // CraftBukkit - SPIGOT-5457 sent by client when interact event cancelled
+- this.level.destroyBlockProgress(this.player.getId(), this.destroyPos, -1);
+- this.debugLogging(pos, true, sequence, "aborted mismatched destroying");
++ BlockState type = this.level.getBlockStateIfLoaded(this.destroyPos); // Paper - don't load unloaded chunks for stale records here
++ if (type != null) this.level.destroyBlockProgress(this.player.getId(), this.destroyPos, -1);
++ if (type != null) this.debugLogging(pos, true, sequence, "aborted mismatched destroying");
++ this.destroyPos = BlockPos.ZERO; // Paper
+ }
+
+ this.level.destroyBlockProgress(this.player.getId(), pos, -1);
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index f57c133de5e974d2c86145f697d3636347a29d65..c3e281754a1cd9d5ce5f4aab36822f9f5d34be39 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1606,6 +1606,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+ case START_DESTROY_BLOCK:
+ case ABORT_DESTROY_BLOCK:
+ case STOP_DESTROY_BLOCK:
++ // Paper start - Don't allow digging into unloaded chunks
++ if (this.player.level().getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) == null) {
++ this.player.connection.ackBlockChangesUpTo(packet.getSequence());
++ return;
++ }
++ // Paper end - Don't allow digging into unloaded chunks
+ this.player.gameMode.handleBlockBreakAction(blockposition, packetplayinblockdig_enumplayerdigtype, packet.getDirection(), this.player.level().getMaxY(), packet.getSequence());
+ this.player.connection.ackBlockChangesUpTo(packet.getSequence());
+ return;