mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-24 09:56:48 +02:00
01a13871de
Patch documentation to come Issues with the old system that are fixed now: - World generation does not scale with cpu cores effectively. - Relies on the main thread for scheduling and maintaining chunk state, dropping chunk load/generate rates at lower tps. - Unreliable prioritisation of chunk gen/load calls that block the main thread. - Shutdown logic is utterly unreliable, as it has to wait for all chunks to unload - is it guaranteed that the chunk system is in a state on shutdown that it can reliably do this? Watchdog shutdown also typically failed due to thread checks, which is now resolved. - Saving of data is not unified (i.e can save chunk data without saving entity data, poses problems for desync if shutdown is really abnormal. - Entities are not loaded with chunks. This caused quite a bit of headache for Chunk#getEntities API, but now the new chunk system loads entities with chunks so that they are ready whenever the chunk loads in. Effectively brings the behavior back to 1.16 era, but still storing entities in their own separate regionfiles. The above list is not complete. The patch documentation will complete it. New chunk system hard relies on starlight and dataconverter, and most importantly the new concurrent utilities in ConcurrentUtil. Some of the old async chunk i/o interface (i.e the old file io thread reroutes _some_ calls to the new file io thread) is kept for plugin compat reasons. It will be removed in the next major version of minecraft. The old legacy chunk system patches have been moved to the removed folder in case we need them again.
91 lines
5.5 KiB
Diff
91 lines
5.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Sat, 25 Jun 2022 19:45:20 -0400
|
|
Subject: [PATCH] Send block entities after destroy prediction
|
|
|
|
Minecraft's prediction system does not handle block entities, so if we are manually sending block entities during
|
|
block breaking we need to set it after the prediction is finished. This fixes block entities not showing when cancelling the BlockBreakEvent.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
|
index 9378e83a67a70dbb1fb4f05b33f1e553d008e62b..5a60f5dc202c44b06ca34e9a19d45cb715f74fd3 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
|
@@ -62,6 +62,8 @@ public class ServerPlayerGameMode {
|
|
private BlockPos delayedDestroyPos;
|
|
private int delayedTickStart;
|
|
private int lastSentState;
|
|
+ public boolean captureSentBlockEntities = false; // Paper
|
|
+ public boolean capturedBlockEntity = false; // Paper
|
|
|
|
public ServerPlayerGameMode(ServerPlayer player) {
|
|
this.gameModeForPlayer = GameType.DEFAULT_MODE;
|
|
@@ -187,10 +189,7 @@ public class ServerPlayerGameMode {
|
|
this.player.connection.send(new ClientboundBlockUpdatePacket(pos, this.level.getBlockState(pos)));
|
|
this.debugLogging(pos, false, sequence, "may not interact");
|
|
// Update any tile entity data for this block
|
|
- BlockEntity tileentity = this.level.getBlockEntity(pos);
|
|
- if (tileentity != null) {
|
|
- this.player.connection.send(tileentity.getUpdatePacket());
|
|
- }
|
|
+ capturedBlockEntity = true; // Paper - send block entity after predicting
|
|
// CraftBukkit end
|
|
return;
|
|
}
|
|
@@ -206,10 +205,7 @@ public class ServerPlayerGameMode {
|
|
// Paper end
|
|
this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos));
|
|
// Update any tile entity data for this block
|
|
- BlockEntity tileentity = this.level.getBlockEntity(pos);
|
|
- if (tileentity != null) {
|
|
- this.player.connection.send(tileentity.getUpdatePacket());
|
|
- }
|
|
+ capturedBlockEntity = true; // Paper - send block entity after predicting
|
|
return;
|
|
}
|
|
// CraftBukkit end
|
|
@@ -385,10 +381,12 @@ public class ServerPlayerGameMode {
|
|
}
|
|
|
|
// Update any tile entity data for this block
|
|
+ if (!captureSentBlockEntities) { // Paper - Toggle this location for capturing as this is used for api
|
|
BlockEntity tileentity = this.level.getBlockEntity(pos);
|
|
if (tileentity != null) {
|
|
this.player.connection.send(tileentity.getUpdatePacket());
|
|
}
|
|
+ } else {capturedBlockEntity = true;} // Paper end
|
|
return false;
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index 92617a19fb328320e17b58956cf0276d5a08325b..e88c82aac6d9947c7205f865c18146e7a5756b40 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -1874,8 +1874,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
|
return;
|
|
}
|
|
// Paper end - Don't allow digging in unloaded chunks
|
|
+ // Paper start - send block entities after prediction
|
|
+ this.player.gameMode.capturedBlockEntity = false;
|
|
+ this.player.gameMode.captureSentBlockEntities = true;
|
|
+ // Paper end - send block entities after prediction
|
|
this.player.gameMode.handleBlockBreakAction(blockposition, packetplayinblockdig_enumplayerdigtype, packet.getDirection(), this.player.level.getMaxBuildHeight(), packet.getSequence());
|
|
this.player.connection.ackBlockChangesUpTo(packet.getSequence());
|
|
+ // Paper start - send block entities after prediction
|
|
+ this.player.gameMode.captureSentBlockEntities = false;
|
|
+ // If a block entity was modified speedup the block change ack to avoid the block entity
|
|
+ // being overriden.
|
|
+ if (this.player.gameMode.capturedBlockEntity) {
|
|
+ // manually tick
|
|
+ this.send(new ClientboundBlockChangedAckPacket(this.ackBlockChangesUpTo));
|
|
+ this.player.connection.ackBlockChangesUpTo = -1;
|
|
+
|
|
+ this.player.gameMode.capturedBlockEntity = false;
|
|
+ BlockEntity tileentity = this.player.level.getBlockEntity(blockposition);
|
|
+ if (tileentity != null) {
|
|
+ this.player.connection.send(tileentity.getUpdatePacket());
|
|
+ }
|
|
+ }
|
|
+ // Paper end - send block entities after prediction
|
|
return;
|
|
default:
|
|
throw new IllegalArgumentException("Invalid player action");
|