From df7367d29d448d5cf7674f1fe76c2a426516c283 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Tue, 18 Jun 2024 14:01:37 +0100 Subject: [PATCH] Add entity tracking range modifier api --- .../0013-Entity-tracking-range-modifier.patch | 23 ++++++++ .../0078-Entity-tracking-range-modifier.patch | 57 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 patches/api/0013-Entity-tracking-range-modifier.patch create mode 100644 patches/server/0078-Entity-tracking-range-modifier.patch diff --git a/patches/api/0013-Entity-tracking-range-modifier.patch b/patches/api/0013-Entity-tracking-range-modifier.patch new file mode 100644 index 0000000..1b16541 --- /dev/null +++ b/patches/api/0013-Entity-tracking-range-modifier.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Samsuik +Date: Tue, 18 Jun 2024 13:34:39 +0100 +Subject: [PATCH] Entity tracking range modifier + + +diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java +index d99d1ad6a2fcd132aefcbe285c77820362672ab6..53c8b97776f308bf78d05fa4939df987cb93f086 100644 +--- a/src/main/java/org/bukkit/entity/Player.java ++++ b/src/main/java/org/bukkit/entity/Player.java +@@ -67,6 +67,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + me.samsuik.sakura.player.visibility.Visibility getVisibility(); + // Sakura end + ++ // Sakura start - entity tracking range modifier ++ double getTrackingRangeModifier(); ++ ++ void setTrackingRangeModifier(double mod); ++ // Sakura end - entity tracking range modifier ++ + // Paper start + @Override + default net.kyori.adventure.identity.@NotNull Identity identity() { diff --git a/patches/server/0078-Entity-tracking-range-modifier.patch b/patches/server/0078-Entity-tracking-range-modifier.patch new file mode 100644 index 0000000..81bbaed --- /dev/null +++ b/patches/server/0078-Entity-tracking-range-modifier.patch @@ -0,0 +1,57 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Samsuik +Date: Tue, 18 Jun 2024 13:34:55 +0100 +Subject: [PATCH] Entity tracking range modifier + + +diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java +index 7a88a81400705a8a1fb234e50528818b7cadc5d6..33b88cf239eed6af6ea03ab6bbeb133aa6443af1 100644 +--- a/src/main/java/net/minecraft/server/level/ChunkMap.java ++++ b/src/main/java/net/minecraft/server/level/ChunkMap.java +@@ -1445,7 +1445,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider + double vec3d_dz = player.getZ() - this.entity.getZ(); + // Paper end - remove allocation of Vec3D here + int i = ChunkMap.this.getPlayerViewDistance(player); +- double d0 = (double) Math.min(this.getEffectiveRange(), i * 16); ++ // Sakura start - entity tracking range modifier ++ double visibleRange = (double) this.getEffectiveRange() * player.trackingRangeModifier; ++ double d0 = (double) Math.min(visibleRange, i * 16); ++ // Sakura end - entity tracking range modifier + double d1 = vec3d_dx * vec3d_dx + vec3d_dz * vec3d_dz; // Paper + double d2 = d0 * d0; + boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player) && ChunkMap.this.isChunkTracked(player, this.entity.chunkPosition().x, this.entity.chunkPosition().z); +diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java +index bed136477493365d62d1b82e8f7802513a394991..a2ab2691c1727ec30c22c0a6e5a6b78da556df19 100644 +--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java ++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +@@ -346,6 +346,7 @@ public class ServerPlayer extends Player { + // Paper start - optimise chunk tick iteration + public double lastEntitySpawnRadiusSquared = -1.0; + // Paper end - optimise chunk tick iteration ++ public double trackingRangeModifier = 1.0; // Sakura - entity tracking range modifier + + public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) { + super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +index 9072827a38fb5dfd736e134c13b7b4b681e57cac..3ddd3fee5d8e2208c6e0afbdf68ca7344772fd8b 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +@@ -2998,6 +2998,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + return (this.getHandle().requestedViewDistance() == 0) ? Bukkit.getViewDistance() : this.getHandle().requestedViewDistance(); + } + ++ // Sakura start - entity tracking range modifier ++ @Override ++ public double getTrackingRangeModifier() { ++ return this.getHandle().trackingRangeModifier * 100.0; ++ } ++ ++ @Override ++ public void setTrackingRangeModifier(double mod) { ++ this.getHandle().trackingRangeModifier = mod / 100.0; ++ } ++ // Sakura end - entity tracking range modifier ++ + // Paper start + @Override + public java.util.Locale locale() {