2020-05-02 06:03:47 +08:00
|
|
|
From c1dd6221baa83a8a02654cebccd95e41a1874554 Mon Sep 17 00:00:00 2001
|
2019-07-20 12:01:24 +08:00
|
|
|
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/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2020-05-02 06:03:47 +08:00
|
|
|
index bde60377ee..b21fca9e5c 100644
|
2019-07-20 12:01:24 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2020-02-09 08:32:48 +08:00
|
|
|
@@ -1272,6 +1272,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
2019-07-20 12:01:24 +08:00
|
|
|
case START_DESTROY_BLOCK:
|
|
|
|
case ABORT_DESTROY_BLOCK:
|
|
|
|
case STOP_DESTROY_BLOCK:
|
|
|
|
+ // Paper start - Don't allow digging in unloaded chunks
|
|
|
|
+ if (this.player.world.getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) == null) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // Paper end - Don't allow digging in unloaded chunks
|
|
|
|
this.player.playerInteractManager.a(blockposition, packetplayinblockdig_enumplayerdigtype, packetplayinblockdig.c(), this.minecraftServer.getMaxBuildHeight());
|
|
|
|
return;
|
|
|
|
default:
|
2020-04-13 11:56:29 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
2020-05-02 06:03:47 +08:00
|
|
|
index e2e5c17c24..17b7eddac4 100644
|
2020-04-13 11:56:29 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
|
|
|
@@ -253,10 +253,12 @@ public class PlayerInteractManager {
|
|
|
|
this.player.playerConnection.sendPacket(new PacketPlayOutBlockBreak(blockposition, this.world.getType(blockposition), packetplayinblockdig_enumplayerdigtype, true, "stopped destroying"));
|
|
|
|
} else if (packetplayinblockdig_enumplayerdigtype == PacketPlayInBlockDig.EnumPlayerDigType.ABORT_DESTROY_BLOCK) {
|
|
|
|
this.e = false;
|
|
|
|
- if (!Objects.equals(this.g, blockposition)) {
|
|
|
|
+ if (!Objects.equals(this.g, blockposition) && !BlockPosition.ZERO.equals(this.g)) { // Paper
|
|
|
|
PlayerInteractManager.LOGGER.debug("Mismatch in destroy block pos: " + this.g + " " + blockposition); // CraftBukkit - SPIGOT-5457 sent by client when interact event cancelled
|
|
|
|
- this.world.a(this.player.getId(), this.g, -1);
|
|
|
|
- this.player.playerConnection.sendPacket(new PacketPlayOutBlockBreak(this.g, this.world.getType(this.g), packetplayinblockdig_enumplayerdigtype, true, "aborted mismatched destroying"));
|
|
|
|
+ IBlockData type = this.world.getTypeIfLoaded(this.g); // Paper - don't load unloaded chunks for stale records here
|
|
|
|
+ if (type != null) this.world.a(this.player.getId(), this.g, -1); // Paper
|
|
|
|
+ if (type != null) this.player.playerConnection.sendPacket(new PacketPlayOutBlockBreak(this.g, type, packetplayinblockdig_enumplayerdigtype, true, "aborted mismatched destroying")); // Paper
|
|
|
|
+ this.g = BlockPosition.ZERO; // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
this.world.a(this.player.getId(), blockposition, -1);
|
2019-07-20 12:01:24 +08:00
|
|
|
--
|
2020-05-02 06:03:47 +08:00
|
|
|
2.26.2
|
2019-07-20 12:01:24 +08:00
|
|
|
|