77 lines
4.7 KiB
Diff
77 lines
4.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: AgentTroll <woodyc40@gmail.com>
|
||
|
|
Date: Fri, 22 Mar 2019 22:24:03 -0700
|
||
|
|
Subject: [PATCH] Update entity Metadata for all tracked players
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||
|
|
index 8311d921ded1c81a1f561dc13db2010d2b7ce5d6..95ac30f56a9268f14d2518974c5a52e08f40ea18 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||
|
|
@@ -1281,6 +1281,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
||
|
|
} else {
|
||
|
|
ChunkMap.TrackedEntity playerchunkmap_entitytracker = new ChunkMap.TrackedEntity(entity, i, j, entitytypes.trackDeltas());
|
||
|
|
|
||
|
|
+ entity.tracker = playerchunkmap_entitytracker; // Paper - Fast access to tracker
|
||
|
|
this.entityMap.put(entity.getId(), playerchunkmap_entitytracker);
|
||
|
|
playerchunkmap_entitytracker.updatePlayers(this.level.players());
|
||
|
|
if (entity instanceof ServerPlayer) {
|
||
|
|
@@ -1323,7 +1324,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
||
|
|
if (playerchunkmap_entitytracker1 != null) {
|
||
|
|
playerchunkmap_entitytracker1.broadcastRemoved();
|
||
|
|
}
|
||
|
|
-
|
||
|
|
+ entity.tracker = null; // Paper - We're no longer tracked
|
||
|
|
}
|
||
|
|
|
||
|
|
protected void tick() {
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
|
||
|
|
index ad9bbda31a4cdb306ca40f2b99e4b815c4f136bd..28afe2f238ded241acf77c3272a44068646b9133 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
|
||
|
|
@@ -392,6 +392,12 @@ public class ServerEntity {
|
||
|
|
return ClientboundMoveEntityPacket.packetToEntity(this.xp, this.yp, this.zp);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start - Add broadcast method
|
||
|
|
+ void broadcast(Packet<?> packet) {
|
||
|
|
+ this.broadcast.accept(packet);
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
private void broadcastAndSend(Packet<?> packet) {
|
||
|
|
this.broadcast.accept(packet);
|
||
|
|
if (this.entity instanceof ServerPlayer) {
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
index defebf7b45e4f006fa7e575b5dbd01ac1e231d5a..6c4266d847b1181a055fa425d5734032dadabf93 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
@@ -2289,7 +2289,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||
|
|
|
||
|
|
if (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem) {
|
||
|
|
// Refresh the current entity metadata
|
||
|
|
- ServerGamePacketListenerImpl.this.send(new ClientboundSetEntityDataPacket(entity.getId(), entity.getEntityData(), true));
|
||
|
|
+ // Paper start - update entity for all players
|
||
|
|
+ ClientboundSetEntityDataPacket packet1 = new ClientboundSetEntityDataPacket(entity.getId(), entity.getEntityData(), true);
|
||
|
|
+ if (entity.tracker != null) {
|
||
|
|
+ entity.tracker.broadcast(packet1);
|
||
|
|
+ } else {
|
||
|
|
+ ServerGamePacketListenerImpl.this.send(packet1);
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
}
|
||
|
|
|
||
|
|
if (event.isCancelled()) {
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
index fcd3e6bfb4b1d0aefcb34eaec1212b08498dd5af..a5159198003e43ce272ae73941d2be47d50eedc9 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
@@ -300,6 +300,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||
|
|
public boolean forceExplosionKnockback; // SPIGOT-949
|
||
|
|
public boolean persistentInvisibility = false;
|
||
|
|
public org.bukkit.Location origin; // Paper
|
||
|
|
+ public net.minecraft.server.level.ChunkMap.TrackedEntity tracker; // Paper - fast access to tracker
|
||
|
|
// Spigot start
|
||
|
|
public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
|
||
|
|
public final boolean defaultActivationState;
|