Skip to content

Resync wandering trader leashes when tracking resumes #14347

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

Open
neonjava wants to merge 3 commits into
base: main
Choose a base branch
from
+22 −1
Open

Resync wandering trader leashes when tracking resumes #14347

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
febd7d0
Fix trader leash desync after tracking resumes
neonjava Oct 4, 2026
8ed8685
Resend leashes when their holder starts tracking
neonjava Oct 22, 2026
048a1ea
Merge Paper main to resolve patch conflicts
neonjava Oct 22, 2026
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
23 changes: 22 additions & 1 deletion paper-server/patches/sources/net/minecraft/server/level/ChunkMap.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
--- a/net/minecraft/server/level/ChunkMap.java
+++ b/net/minecraft/server/level/ChunkMap.java
@@ -58,6 +_,7 @@
import net.minecraft.network.protocol.game.ClientGamePacketListener;
import net.minecraft.network.protocol.game.ClientboundChunksBiomesPacket;
import net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket;
+import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
import net.minecraft.resources.Identifier;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.network.ServerPlayerConnection;
@@ -73,6 +_,7 @@
import net.minecraft.util.thread.ConsecutiveExecutor;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.Leashable;
import net.minecraft.world.entity.UpdateInterval;
import net.minecraft.world.entity.ai.village.poi.PoiManager;
import net.minecraft.world.entity.boss.enderdragon.EnderDragonPart;
@@ -151,6 +_,33 @@
public int serverViewDistance;
private final WorldGenContext worldGenContext;
Expand Down Expand Up @@ -311,7 +327,7 @@
if (this.seenBy.remove(player.connection)) {
this.serverEntity.removePairing(player);
if (this.seenBy.isEmpty()) {
@@ -1382,23 +_,47 @@
@@ -1382,23 +_,52 @@
}

public void updatePlayer(final ServerPlayer player) {
Expand Down Expand Up @@ -352,6 +368,11 @@
+ // Paper start - entity tracking events
+ if (io.papermc.paper.event.player.PlayerTrackEntityEvent.getHandlerList().getRegisteredListeners().length == 0 || new io.papermc.paper.event.player.PlayerTrackEntityEvent(player.getBukkitEntity(), this.entity.getBukkitEntity()).callEvent()) {
this.serverEntity.addPairing(player);
+ // Paper start - Resend leashes when the holder starts being tracked
+ for (Leashable leashed : Leashable.leashableLeashedTo(this.entity)) {
+ player.connection.send(new ClientboundSetEntityLinkPacket((Entity) leashed, this.entity));
+ }
+ // Paper end - Resend leashes when the holder starts being tracked
if (this.seenBy.size() == 1) {
ChunkMap.this.level.debugSynchronizers().registerEntity(this.entity);
}
Expand Down
Loading