Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 19:40:07 +01:00
03a4e7ac75
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 37262de8 PR-812: Add Registry#match(String) d6b40162 SPIGOT-4569: Add more BlockData API f9691891 PR-809: Throw a more clear error for BlockIterators with zero direction, add Vector#isZero() 91e79e19 PR-804: Added methods to get translation keys for materials, itemstacks and more 426b00d3 PR-795: Add new BiomeParameterPoint passed to BiomeProvider#getBiome 0e91ea52 SPIGOT-7224: Add events for brewing stands and campfires starting their actions CraftBukkit Changes: a50301aa5 Fix issues with fluid tag conversion and fluid #isTagged 6aeb5e4c3 SPIGOT-4569: Implement more BlockData API 7dbf862c2 PR-1131: Added methods to get translation keys for materials, itemstacks and more 7167588b1 PR-1117: Add new BiomeParameterPoint passed to BiomeProvider#getBiome 7c44152eb SPIGOT-7224: Add events for brewing stands and campfires starting their actions
92 Zeilen
5.5 KiB
Diff
92 Zeilen
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 796d17f51496974cfdfed2593753b8c09b5c81c1..13031576c20bda3bb12c926f6cd938fa5fb105f2 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 c1041c3832c73728cbb146815ca3c03b3ba41dc4..7183db74a3ebd7d278b7bf65de49dd1cde11611f 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -1863,8 +1863,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");
|