Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-21 07:49:35 +00:00
Code Issues Releases Activity

Update 1.20.2 (#139)

Browse Source
This commit is contained in:
violetc
2023-09-28 18:12:42 +08:00
committed by GitHub
parent 847357b67c
commit 4b8764ebda
140 changed files with 2443 additions and 2695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
patches/server/0035-Remove-streams-and-iterators-from-range-check.patch Normal file
View File

@@ -0,0 +1,64 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: violetc <58360096+s-yh-china@users.noreply.github.com>
Date: Wed, 17 Aug 2022 11:19:33 +0800
Subject: [PATCH] Remove streams and iterators from range check
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index e809ef00c17d2a55877799c595c6732f74f1680e..ed2e0774d5b14d4926b3214ebf3795d7555327e3 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1314,19 +1314,45 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
}
+ // Leaves start
+ private static int getHighestRange(Entity parent, int highest) {
+ List<Entity> passengers = parent.getPassengers();
+
+ for (int i = 0, size = passengers.size(); i < size; i++) {
+ Entity entity = passengers.get(i);
+ int range = entity.getType().clientTrackingRange() * 16;
+ range = org.spigotmc.TrackingRange.getEntityTrackingRange(entity, range); // Paper
+
+ if (range > highest) { // Paper - we need the lowest range thanks to the fact that our tracker doesn't account for passenger logic // Tuinity - not anymore!
+ highest = range;
+ }
+
+ highest = getHighestRange(entity, highest);
+ }
+
+ return highest;
+ }
+ // Leaves end
+
private int getEffectiveRange() {
int i = this.range;
- Iterator iterator = this.entity.getIndirectPassengers().iterator();
+ // Leaves start - remove iterators and streams
+ if (top.leavesmc.leaves.LeavesConfig.removeRangeCheckStreams) {
+ i = getHighestRange(this.entity, i);
+ } else {
+ Iterator iterator = this.entity.getIndirectPassengers().iterator();
- while (iterator.hasNext()) {
- Entity entity = (Entity) iterator.next();
- int j = entity.getType().clientTrackingRange() * 16;
- j = org.spigotmc.TrackingRange.getEntityTrackingRange(entity, j); // Paper
+ while (iterator.hasNext()) {
+ Entity entity = (Entity) iterator.next();
+ int j = entity.getType().clientTrackingRange() * 16;
+ j = org.spigotmc.TrackingRange.getEntityTrackingRange(entity, j); // Paper
- if (j > i) {
- i = j;
+ if (j > i) {
+ i = j;
+ }
}
}
+ // Leaves end - remove iterators and streams
return this.scaledRange(i);
}