2020-04-27 07:57:42 +02:00
|
|
|
From dd6dba897fb9a1838363f2bd89da221a9f6ae91b Mon Sep 17 00:00:00 2001
|
2019-03-24 18:00:42 +01:00
|
|
|
From: AgentTroll <woodyc40@gmail.com>
|
|
|
|
Date: Fri, 22 Mar 2019 22:24:03 -0700
|
2019-03-24 22:48:22 +01:00
|
|
|
Subject: [PATCH] Update entity Metadata for all tracked players
|
2019-03-24 18:00:42 +01:00
|
|
|
|
|
|
|
|
2019-05-06 02:57:14 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
2020-04-27 07:57:42 +02:00
|
|
|
index 3ff7a7b4a8..3a88c9a670 100644
|
2019-05-06 02:57:14 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
2019-12-12 17:20:43 +01:00
|
|
|
@@ -387,6 +387,12 @@ public class EntityTrackerEntry {
|
2019-05-06 02:57:14 +02:00
|
|
|
return PacketPlayOutEntity.a(this.xLoc, this.yLoc, this.zLoc);
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - Add broadcast method
|
|
|
|
+ void broadcast(Packet<?> packet) {
|
|
|
|
+ this.getPacketConsumer().accept(packet);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
private void broadcastIncludingSelf(Packet<?> packet) {
|
|
|
|
this.f.accept(packet);
|
|
|
|
if (this.tracker instanceof EntityPlayer) {
|
2019-03-24 18:00:42 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2020-04-27 07:57:42 +02:00
|
|
|
index 94d3d602cc..f496006f3c 100644
|
2019-03-24 18:00:42 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2020-04-27 07:57:42 +02:00
|
|
|
@@ -2006,7 +2006,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
2019-03-24 18:00:42 +01:00
|
|
|
|
|
|
|
if (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != origItem) {
|
|
|
|
// Refresh the current entity metadata
|
|
|
|
- this.sendPacket(new PacketPlayOutEntityMetadata(entity.getId(), entity.datawatcher, true));
|
2020-04-27 07:57:42 +02:00
|
|
|
+ // Paper start - update entity for all players
|
|
|
|
+ PacketPlayOutEntityMetadata packet = new PacketPlayOutEntityMetadata(entity.getId(), entity.datawatcher, true);
|
|
|
|
+ if (entity.tracker != null) {
|
|
|
|
+ entity.tracker.broadcast(packet);
|
|
|
|
+ } else {
|
|
|
|
+ this.sendPacket(packet);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2019-03-24 18:00:42 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (event.isCancelled()) {
|
|
|
|
--
|
2020-04-27 07:57:42 +02:00
|
|
|
2.26.2
|
2019-03-24 18:00:42 +01:00
|
|
|
|