mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-24 19:46:21 +01:00
ad9c58e103
Since 1.21.2, vanilla split relative teleportation flags into position and delta/velocity flags into separate enum entries. This highlighted a design flaw in the paper api addition for teleport flags, which just simply mirrored internals while also only being able to apply the delta/velocity part of a flag, given the teleport target is always absolute in the API. This patch proposes to simply no longer expose the non-velocity related flags to the API, instead marking the entire Relative enum as being purely velocity related, as non-velocity related flags are not useful to callers. This was done over simply exposing all internal flags, as another vanilla change to the internal enum would result in the same breakage. The newly proposed API *only* promises that the passed flags prevent the loss of velocity in the specific axis/context, which should be independent enough of vanillas specific implementation of this feature.
92 lines
5.7 KiB
Diff
92 lines
5.7 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 5c3e5c348e6fececccd8097355f423b9e7ad982b..064a7a3e1c4d192010e072a5e985a54135748d87 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
|
@@ -61,6 +61,8 @@ public class ServerPlayerGameMode {
|
|
private BlockPos delayedDestroyPos;
|
|
private int delayedTickStart;
|
|
private int lastSentState;
|
|
+ public boolean captureSentBlockEntities = false; // Paper - Send block entities after destroy prediction
|
|
+ public boolean capturedBlockEntity = false; // Paper - Send block entities after destroy prediction
|
|
|
|
public ServerPlayerGameMode(ServerPlayer player) {
|
|
this.gameModeForPlayer = GameType.DEFAULT_MODE;
|
|
@@ -191,10 +193,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 entities after destroy prediction
|
|
// CraftBukkit end
|
|
return;
|
|
}
|
|
@@ -205,10 +204,7 @@ public class ServerPlayerGameMode {
|
|
// Let the client know the block still exists
|
|
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 entities after destroy prediction
|
|
return;
|
|
}
|
|
// CraftBukkit end
|
|
@@ -393,10 +389,12 @@ public class ServerPlayerGameMode {
|
|
}
|
|
|
|
// Update any tile entity data for this block
|
|
+ if (!captureSentBlockEntities) { // Paper - Send block entities after destroy prediction
|
|
BlockEntity tileentity = this.level.getBlockEntity(pos);
|
|
if (tileentity != null) {
|
|
this.player.connection.send(tileentity.getUpdatePacket());
|
|
}
|
|
+ } else {capturedBlockEntity = true;} // Paper - Send block entities after destroy prediction
|
|
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 10f7e45f192ef50b9d9bf5fc83a8090efb2b1042..51ee01dfe5e144cb881c9376e586b95790a9ab98 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -1724,8 +1724,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
|
return;
|
|
}
|
|
// Paper end - Don't allow digging into unloaded chunks
|
|
+ // Paper start - Send block entities after destroy prediction
|
|
+ this.player.gameMode.capturedBlockEntity = false;
|
|
+ this.player.gameMode.captureSentBlockEntities = true;
|
|
+ // Paper end - Send block entities after destroy prediction
|
|
this.player.gameMode.handleBlockBreakAction(blockposition, packetplayinblockdig_enumplayerdigtype, packet.getDirection(), this.player.level().getMaxY(), packet.getSequence());
|
|
this.player.connection.ackBlockChangesUpTo(packet.getSequence());
|
|
+ // Paper start - Send block entities after destroy 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 destroy prediction
|
|
return;
|
|
default:
|
|
throw new IllegalArgumentException("Invalid player action");
|