mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
21 lines
1.3 KiB
Diff
21 lines
1.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: booky10 <boooky10@gmail.com>
|
||
|
|
Date: Sun, 29 Oct 2023 02:36:10 +0100
|
||
|
|
Subject: [PATCH] Broadcast take item packets with collector as source
|
||
|
|
|
||
|
|
This fixes players (which can't view the collector) seeing item pickups with themselves as the target.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
index 675d695989cef5d8fc2e85673efbb57ec1bb38bd..a76eb3d051db0229ed088b71c92ff3f131449007 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
@@ -3701,7 +3701,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||
|
|
|
||
|
|
public void take(Entity item, int count) {
|
||
|
|
if (!item.isRemoved() && !this.level().isClientSide && (item instanceof ItemEntity || item instanceof AbstractArrow || item instanceof ExperienceOrb)) {
|
||
|
|
- ((ServerLevel) this.level()).getChunkSource().broadcast(item, new ClientboundTakeItemEntityPacket(item.getId(), this.getId(), count));
|
||
|
|
+ ((ServerLevel) this.level()).getChunkSource().broadcastAndSend(this, new ClientboundTakeItemEntityPacket(item.getId(), this.getId(), count)); // Paper - broadcast with collector as source
|
||
|
|
}
|
||
|
|
|
||
|
|
}
|