diff options
Diffstat (limited to 'patch-remap/og/net/minecraft/server/level/EntityTrackerEntry.patch')
| -rw-r--r-- | patch-remap/og/net/minecraft/server/level/EntityTrackerEntry.patch | 142 |
1 files changed, 142 insertions, 0 deletions
diff --git a/patch-remap/og/net/minecraft/server/level/EntityTrackerEntry.patch b/patch-remap/og/net/minecraft/server/level/EntityTrackerEntry.patch new file mode 100644 index 0000000000..7f8f46b1df --- /dev/null +++ b/patch-remap/og/net/minecraft/server/level/EntityTrackerEntry.patch @@ -0,0 +1,142 @@ +--- a/net/minecraft/server/level/EntityTrackerEntry.java ++++ b/net/minecraft/server/level/EntityTrackerEntry.java +@@ -42,6 +42,12 @@ + import net.minecraft.world.phys.Vec3D; + import org.slf4j.Logger; + ++// CraftBukkit start ++import net.minecraft.server.network.ServerPlayerConnection; ++import org.bukkit.entity.Player; ++import org.bukkit.event.player.PlayerVelocityEvent; ++// CraftBukkit end ++ + public class EntityTrackerEntry { + + private static final Logger LOGGER = LogUtils.getLogger(); +@@ -66,8 +72,12 @@ + private boolean wasOnGround; + @Nullable + private List<DataWatcher.b<?>> trackedDataValues; ++ // CraftBukkit start ++ private final Set<ServerPlayerConnection> trackedPlayers; + +- public EntityTrackerEntry(WorldServer worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer) { ++ public EntityTrackerEntry(WorldServer worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) { ++ this.trackedPlayers = trackedPlayers; ++ // CraftBukkit end + this.ap = Vec3D.ZERO; + this.lastPassengers = Collections.emptyList(); + this.level = worldserver; +@@ -87,7 +97,7 @@ + List<Entity> list = this.entity.getPassengers(); + + if (!list.equals(this.lastPassengers)) { +- this.broadcast.accept(new PacketPlayOutMount(this.entity)); ++ this.broadcastAndSend(new PacketPlayOutMount(this.entity)); // CraftBukkit + removedPassengers(list, this.lastPassengers).forEach((entity) -> { + if (entity instanceof EntityPlayer) { + EntityPlayer entityplayer = (EntityPlayer) entity; +@@ -104,18 +114,18 @@ + if (entity instanceof EntityItemFrame) { + EntityItemFrame entityitemframe = (EntityItemFrame) entity; + +- if (this.tickCount % 10 == 0) { ++ if (true || this.tickCount % 10 == 0) { // CraftBukkit - Moved below, should always enter this block + ItemStack itemstack = entityitemframe.getItem(); + +- if (itemstack.getItem() instanceof ItemWorldMap) { ++ if (this.tickCount % 10 == 0 && itemstack.getItem() instanceof ItemWorldMap) { // CraftBukkit - Moved this.tickCounter % 10 logic here so item frames do not enter the other blocks + Integer integer = ItemWorldMap.getMapId(itemstack); + WorldMap worldmap = ItemWorldMap.getSavedData(integer, this.level); + + if (worldmap != null) { +- Iterator iterator = this.level.players().iterator(); ++ Iterator<ServerPlayerConnection> iterator = this.trackedPlayers.iterator(); // CraftBukkit + + while (iterator.hasNext()) { +- EntityPlayer entityplayer = (EntityPlayer) iterator.next(); ++ EntityPlayer entityplayer = iterator.next().getPlayer(); // CraftBukkit + + worldmap.tickCarriedBy(entityplayer, itemstack); + Packet<?> packet = worldmap.getUpdatePacket(integer, entityplayer); +@@ -228,7 +238,27 @@ + + ++this.tickCount; + if (this.entity.hurtMarked) { +- this.broadcastAndSend(new PacketPlayOutEntityVelocity(this.entity)); ++ // CraftBukkit start - Create PlayerVelocity event ++ boolean cancelled = false; ++ ++ if (this.entity instanceof EntityPlayer) { ++ Player player = (Player) this.entity.getBukkitEntity(); ++ org.bukkit.util.Vector velocity = player.getVelocity(); ++ ++ PlayerVelocityEvent event = new PlayerVelocityEvent(player, velocity.clone()); ++ this.entity.level().getCraftServer().getPluginManager().callEvent(event); ++ ++ if (event.isCancelled()) { ++ cancelled = true; ++ } else if (!velocity.equals(event.getVelocity())) { ++ player.setVelocity(event.getVelocity()); ++ } ++ } ++ ++ if (!cancelled) { ++ this.broadcastAndSend(new PacketPlayOutEntityVelocity(this.entity)); ++ } ++ // CraftBukkit end + this.entity.hurtMarked = false; + } + +@@ -256,7 +286,10 @@ + + public void sendPairingData(EntityPlayer entityplayer, Consumer<Packet<PacketListenerPlayOut>> consumer) { + if (this.entity.isRemoved()) { +- EntityTrackerEntry.LOGGER.warn("Fetching packet for removed entity {}", this.entity); ++ // CraftBukkit start - Remove useless error spam, just return ++ // EntityTrackerEntry.LOGGER.warn("Fetching packet for removed entity {}", this.entity); ++ return; ++ // CraftBukkit end + } + + Packet<PacketListenerPlayOut> packet = this.entity.getAddEntityPacket(); +@@ -272,6 +305,12 @@ + if (this.entity instanceof EntityLiving) { + Collection<AttributeModifiable> collection = ((EntityLiving) this.entity).getAttributes().getSyncableAttributes(); + ++ // CraftBukkit start - If sending own attributes send scaled health instead of current maximum health ++ if (this.entity.getId() == entityplayer.getId()) { ++ ((EntityPlayer) this.entity).getBukkitEntity().injectScaledMaxHealth(collection, false); ++ } ++ // CraftBukkit end ++ + if (!collection.isEmpty()) { + consumer.accept(new PacketPlayOutUpdateAttributes(this.entity.getId(), collection)); + } +@@ -303,7 +342,14 @@ + if (!list.isEmpty()) { + consumer.accept(new PacketPlayOutEntityEquipment(this.entity.getId(), list)); + } ++ ((EntityLiving) this.entity).detectEquipmentUpdatesPublic(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending ++ } ++ ++ // CraftBukkit start - MC-109346: Fix for nonsensical head yaw ++ if (this.entity instanceof EntityPlayer) { ++ consumer.accept(new PacketPlayOutEntityHeadRotation(this.entity, (byte) MathHelper.floor(this.entity.getYHeadRot() * 256.0F / 360.0F))); + } ++ // CraftBukkit end + + if (!this.entity.getPassengers().isEmpty()) { + consumer.accept(new PacketPlayOutMount(this.entity)); +@@ -338,6 +384,11 @@ + Set<AttributeModifiable> set = ((EntityLiving) this.entity).getAttributes().getDirtyAttributes(); + + if (!set.isEmpty()) { ++ // CraftBukkit start - Send scaled max health ++ if (this.entity instanceof EntityPlayer) { ++ ((EntityPlayer) this.entity).getBukkitEntity().injectScaledMaxHealth(set, false); ++ } ++ // CraftBukkit end + this.broadcastAndSend(new PacketPlayOutUpdateAttributes(this.entity.getId(), set)); + } + |