2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
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
2024-06-13 21:04:27 +02:00
index a5b0efd6142075ca1ecb604afbc1d0162199e7a4..da9e864520150acd8027545672aa476be414bb4d 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
2024-06-13 21:04:27 +02:00
@@ -124,8 +124,8 @@ public class ServerPlayerGameMode {
2021-06-11 14:02:28 +02:00
BlockState iblockdata;
if (this.hasDelayedDestroy) {
- iblockdata = this.level.getBlockState(this.delayedDestroyPos);
- if (iblockdata.isAir()) {
2024-01-21 13:56:22 +01:00
+ 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
2021-06-11 14:02:28 +02:00
this.hasDelayedDestroy = false;
} else {
float f = this.incrementDestroyProgress(iblockdata, this.delayedDestroyPos, this.delayedTickStart);
2024-06-13 21:04:27 +02:00
@@ -136,7 +136,13 @@ public class ServerPlayerGameMode {
2021-06-11 14:02:28 +02:00
}
}
} else if (this.isDestroyingBlock) {
- iblockdata = this.level.getBlockState(this.destroyPos);
2024-01-21 13:56:22 +01:00
+ // Paper start - Don't allow digging into unloaded chunks; don't want to do same logic as above, return instead
2021-12-06 00:32:02 +01:00
+ iblockdata = this.level.getBlockStateIfLoaded(this.destroyPos);
2021-06-11 14:02:28 +02:00
+ if (iblockdata == null) {
+ this.isDestroyingBlock = false;
+ return;
+ }
2024-01-21 13:56:22 +01:00
+ // Paper end - Don't allow digging into unloaded chunks
2021-06-11 14:02:28 +02:00
if (iblockdata.isAir()) {
this.level.destroyBlockProgress(this.player.getId(), this.destroyPos, -1);
this.lastSentState = -1;
2024-06-13 21:04:27 +02:00
@@ -165,6 +171,7 @@ public class ServerPlayerGameMode {
2021-07-16 01:00:58 +02:00
2022-06-08 03:31:24 +02:00
public void handleBlockBreakAction(BlockPos pos, ServerboundPlayerActionPacket.Action action, Direction direction, int worldHeight, int sequence) {
2024-04-24 07:43:09 +02:00
if (!this.player.canInteractWithBlock(pos, 1.0D)) {
2024-01-21 13:56:22 +01:00
+ if (true) return; // Paper - Don't allow digging into unloaded chunks; Don't notify if unreasonably far away
2022-06-08 03:31:24 +02:00
this.debugLogging(pos, false, sequence, "too far");
} else if (pos.getY() >= worldHeight) {
this.player.connection.send(new ClientboundBlockUpdatePacket(pos, this.level.getBlockState(pos)));
2024-06-13 21:04:27 +02:00
@@ -307,10 +314,12 @@ public class ServerPlayerGameMode {
2022-06-08 03:31:24 +02:00
this.debugLogging(pos, true, sequence, "stopped destroying");
2021-06-11 14:02:28 +02:00
} else if (action == ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK) {
this.isDestroyingBlock = false;
- if (!Objects.equals(this.destroyPos, pos)) {
2022-06-08 03:31:24 +02:00
+ if (!Objects.equals(this.destroyPos, pos) && !BlockPos.ZERO.equals(this.destroyPos)) { // Paper
2021-06-13 10:26:58 +02:00
ServerPlayerGameMode.LOGGER.debug("Mismatch in destroy block pos: {} {}", this.destroyPos, pos); // CraftBukkit - SPIGOT-5457 sent by client when interact event cancelled
2021-06-11 14:02:28 +02:00
- this.level.destroyBlockProgress(this.player.getId(), this.destroyPos, -1);
2022-06-08 03:31:24 +02:00
- this.debugLogging(pos, true, sequence, "aborted mismatched destroying");
2021-12-06 00:32:02 +01:00
+ BlockState type = this.level.getBlockStateIfLoaded(this.destroyPos); // Paper - don't load unloaded chunks for stale records here
2022-06-08 03:31:24 +02:00
+ if (type != null) this.level.destroyBlockProgress(this.player.getId(), this.destroyPos, -1);
+ if (type != null) this.debugLogging(pos, true, sequence, "aborted mismatched destroying");
2021-06-11 14:02:28 +02:00
+ 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
2024-06-15 18:28:18 +02:00
index b1a0c0e2d02af3730293f4708ce50479ede2ccab..9b255f9551fa66efa21944e284a40a03aefc3040 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
2024-06-13 21:04:27 +02:00
@@ -1595,6 +1595,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
2021-06-11 14:02:28 +02:00
case START_DESTROY_BLOCK:
case ABORT_DESTROY_BLOCK:
case STOP_DESTROY_BLOCK:
2024-01-21 13:56:22 +01:00
+ // Paper start - Don't allow digging into unloaded chunks
2023-06-07 22:41:26 +02:00
+ if (this.player.level().getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) == null) {
2022-06-08 03:31:24 +02:00
+ this.player.connection.ackBlockChangesUpTo(packet.getSequence());
2021-06-11 14:02:28 +02:00
+ return;
+ }
2024-01-21 13:56:22 +01:00
+ // Paper end - Don't allow digging into unloaded chunks
2023-06-07 22:41:26 +02:00
this.player.gameMode.handleBlockBreakAction(blockposition, packetplayinblockdig_enumplayerdigtype, packet.getDirection(), this.player.level().getMaxBuildHeight(), packet.getSequence());
2022-06-08 03:31:24 +02:00
this.player.connection.ackBlockChangesUpTo(packet.getSequence());
2021-06-11 14:02:28 +02:00
return;