Skip to content

Avoid potentially unnecessary block acks #9699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pseudospace0 wants to merge 3 commits into from
Closed

Avoid potentially unnecessary block acks #9699

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45e7ce6
Create 1029-Avoid-potentially-unnecessary-block-ack.patch
pseudospace0 Sep 9, 2023
0a42859
Merge branch 'PaperMC:master' into Avoid-potentially-unnecessary-bloc…
pseudospace0 Sep 10, 2023
fb7f814
add comments
pseudospace0 Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions patches/server/1029-Avoid-potentially-unnecessary-block-ack.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: pseudospace0 <pseudospace0@proton.me>
Date: Sun, 10 Sep 2023 14:28:02 +0200
Subject: [PATCH] Avoid potentially unnecessary block acks


diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index 618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9..8e7e8772ffd0c2fcd31224d0cc2cada5685f4bca 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -181,6 +181,10 @@ public class ServerPlayerGameMode {
this.player.connection.send(new ClientboundBlockUpdatePacket(pos, this.level.getBlockState(pos)));
this.debugLogging(pos, false, sequence, "too high");
} else {
+ // Paper - Avoid potentially unnecessary block acks
+ this.player.connection.ackBlockChangesUpTo(sequence);
+ // Paper end
+
BlockState iblockdata;

if (action == ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK) {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 3c0651fa5a5db880202c9a3805a6455269c5f16d..99865e6ef35f8c268c173baa0d0a14c15f994da8 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1925,7 +1925,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
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