Skip to content

Commit febd7d0

Browse files
committed
Fix trader leash desync after tracking resumes
1 parent 6e88e46 commit febd7d0

1 file changed

Lines changed: 32 additions & 1 deletion

File tree

‎paper-server/patches/sources/net/minecraft/server/level/ChunkMap.java.patch‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
--- a/net/minecraft/server/level/ChunkMap.java
22
+++ b/net/minecraft/server/level/ChunkMap.java
3+
@@ -58,6 +_,7 @@
4+
import net.minecraft.network.protocol.game.ClientGamePacketListener;
5+
import net.minecraft.network.protocol.game.ClientboundChunksBiomesPacket;
6+
import net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket;
7+
+import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
8+
import net.minecraft.resources.Identifier;
9+
import net.minecraft.resources.ResourceKey;
10+
import net.minecraft.server.network.ServerPlayerConnection;
11+
@@ -73,9 +_,11 @@
12+
import net.minecraft.util.thread.ConsecutiveExecutor;
13+
import net.minecraft.world.entity.Entity;
14+
import net.minecraft.world.entity.EntityType;
15+
+import net.minecraft.world.entity.Leashable;
16+
import net.minecraft.world.entity.UpdateInterval;
17+
import net.minecraft.world.entity.ai.village.poi.PoiManager;
18+
import net.minecraft.world.entity.boss.enderdragon.EnderDragonPart;
19+
+import net.minecraft.world.entity.npc.wanderingtrader.WanderingTrader;
20+
import net.minecraft.world.level.ChunkPos;
21+
import net.minecraft.world.level.Level;
22+
import net.minecraft.world.level.TicketStorage;
323
@@ -151,6 +_,33 @@
424
public int serverViewDistance;
525
private final WorldGenContext worldGenContext;
@@ -311,7 +331,7 @@
311331
if (this.seenBy.remove(player.connection)) {
312332
this.serverEntity.removePairing(player);
313333
if (this.seenBy.isEmpty()) {
314-
@@ -1382,23 +_,47 @@
334+
@@ -1382,23 +_,58 @@
315335
}
316336

317337
public void updatePlayer(final ServerPlayer player) {
@@ -352,6 +372,17 @@
352372
+ // Paper start - entity tracking events
353373
+ if (io.papermc.paper.event.player.PlayerTrackEntityEvent.getHandlerList().getRegisteredListeners().length == 0 || new io.papermc.paper.event.player.PlayerTrackEntityEvent(player.getBukkitEntity(), this.entity.getBukkitEntity()).callEvent()) {
354374
this.serverEntity.addPairing(player);
375+
+ // Paper start - Resend trader leashes when the holder returns to tracking range
376+
+ if (this.entity instanceof WanderingTrader) {
377+
+ for (Leashable leashed : Leashable.leashableLeashedTo(this.entity)) {
378+
+ Entity leashedEntity = (Entity) leashed;
379+
+ TrackedEntity leashedTracker = ChunkMap.this.entityMap.get(leashedEntity.getId());
380+
+ if (leashedTracker != null && leashedTracker.seenBy.contains(player.connection)) {
381+
+ player.connection.send(new ClientboundSetEntityLinkPacket(leashedEntity, this.entity));
382+
+ }
383+
+ }
384+
+ }
385+
+ // Paper end - Resend trader leashes when the holder returns to tracking range
355386
if (this.seenBy.size() == 1) {
356387
ChunkMap.this.level.debugSynchronizers().registerEntity(this.entity);
357388
}

0 commit comments

Comments
 (0)