|
1 | 1 | --- a/net/minecraft/server/level/ChunkMap.java |
2 | 2 | +++ 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; |
3 | 23 | @@ -151,6 +_,33 @@ |
4 | 24 | public int serverViewDistance; |
5 | 25 | private final WorldGenContext worldGenContext; |
|
311 | 331 | if (this.seenBy.remove(player.connection)) { |
312 | 332 | this.serverEntity.removePairing(player); |
313 | 333 | if (this.seenBy.isEmpty()) { |
314 | | -@@ -1382,23 +_,47 @@ |
| 334 | +@@ -1382,23 +_,58 @@ |
315 | 335 | } |
316 | 336 |
|
317 | 337 | public void updatePlayer(final ServerPlayer player) { |
|
352 | 372 | + // Paper start - entity tracking events |
353 | 373 | + if (io.papermc.paper.event.player.PlayerTrackEntityEvent.getHandlerList().getRegisteredListeners().length == 0 || new io.papermc.paper.event.player.PlayerTrackEntityEvent(player.getBukkitEntity(), this.entity.getBukkitEntity()).callEvent()) { |
354 | 374 | 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 |
355 | 386 | if (this.seenBy.size() == 1) { |
356 | 387 | ChunkMap.this.level.debugSynchronizers().registerEntity(this.entity); |
357 | 388 | } |
|
0 commit comments