mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-21 16:09:19 +00:00
Drop useless fix
getProfiler method is removed from PathNavigationRegion since 1.21.3 snapshot 24w37a
This commit is contained in:
@@ -1,23 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
|
||||||
Date: Mon, 19 Feb 2024 13:10:16 -0500
|
|
||||||
Subject: [PATCH] Redirect vanilla getProfiler to inactive in
|
|
||||||
PathNavigationRegion
|
|
||||||
|
|
||||||
To fix compatibility with some plugins, e.g. Citizens, ModelEngine, etc.
|
|
||||||
|
|
||||||
diff --git a/net/minecraft/world/level/PathNavigationRegion.java b/net/minecraft/world/level/PathNavigationRegion.java
|
|
||||||
index 21dee87c792dcba52d9dff637e4729a2ec377ac0..89571b56618ad83b8fd1c218f0f2bb0a72ea3d49 100644
|
|
||||||
--- a/net/minecraft/world/level/PathNavigationRegion.java
|
|
||||||
+++ b/net/minecraft/world/level/PathNavigationRegion.java
|
|
||||||
@@ -153,4 +153,10 @@ public class PathNavigationRegion implements CollisionGetter {
|
|
||||||
public int getHeight() {
|
|
||||||
return this.level.getHeight();
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ // Leaf start - Redirect vanilla getProfiler to inactive in PathNavigationRegion
|
|
||||||
+ public net.minecraft.util.profiling.ProfilerFiller getProfiler() {
|
|
||||||
+ return net.minecraft.util.profiling.InactiveProfiler.INSTANCE; // Gale - Purpur - remove vanilla profiler
|
|
||||||
+ }
|
|
||||||
+ // Leaf end - Redirect vanilla getProfiler to inactive in PathNavigationRegion
|
|
||||||
}
|
|
||||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Virtual thread for chat executor
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
||||||
index 9da4c27c7d0b6c0d328d592aa78eac1d073eb1fe..07c371c4d65b4fec7b9701a7de62f18399d80df0 100644
|
index 827c6e053022b29dc79cb3f779432aa567c16819..bc643159911320de9d8f6b88e23db93a2b192ea6 100644
|
||||||
--- a/net/minecraft/server/MinecraftServer.java
|
--- a/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/net/minecraft/server/MinecraftServer.java
|
+++ b/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -2650,7 +2650,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -2650,7 +2650,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
@@ -48,7 +48,7 @@ index 4979171c8da6f366aab636fb3058ca457fe75061..91574985958950dffe0f393d7dfac481
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
||||||
index 66b7205ea7da8b452e6e66676d75d2b29ed6b6d5..3e4d17bf0a67e8196baf405b3e95c4fb49df000d 100644
|
index c50cb9bfcd06ec54c0a43d013aa074fb478f9fcf..645bb18c5e3a13e89227b9d05a52eeb882fdd03b 100644
|
||||||
--- a/net/minecraft/server/level/ServerLevel.java
|
--- a/net/minecraft/server/level/ServerLevel.java
|
||||||
+++ b/net/minecraft/server/level/ServerLevel.java
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
||||||
@@ -628,6 +628,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
@@ -628,6 +628,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove stream in entity visible effects filter
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
||||||
index 1ba42eaaf9ceb41c5ef184f3002135c0781abe33..2d8562ab5f399d5be8453bca0637586f7e221c8a 100644
|
index d5994607475e69f8a0da41d5198ba63dfa5a27df..db00f920fcc43d8dbdf2d6d18b3309ec1e468f17 100644
|
||||||
--- a/net/minecraft/world/entity/LivingEntity.java
|
--- a/net/minecraft/world/entity/LivingEntity.java
|
||||||
+++ b/net/minecraft/world/entity/LivingEntity.java
|
+++ b/net/minecraft/world/entity/LivingEntity.java
|
||||||
@@ -1013,12 +1013,15 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
@@ -1013,12 +1013,15 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
||||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Replace Entity active effects map with optimized collection
|
|||||||
Dreeam TODO: check this
|
Dreeam TODO: check this
|
||||||
|
|
||||||
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
||||||
index 2d8562ab5f399d5be8453bca0637586f7e221c8a..6214467ae7e2e9d84e46abed00a94bc22d4a3da7 100644
|
index db00f920fcc43d8dbdf2d6d18b3309ec1e468f17..b312a28c1ad5fbf5ef67f7794bee481bce4e29ca 100644
|
||||||
--- a/net/minecraft/world/entity/LivingEntity.java
|
--- a/net/minecraft/world/entity/LivingEntity.java
|
||||||
+++ b/net/minecraft/world/entity/LivingEntity.java
|
+++ b/net/minecraft/world/entity/LivingEntity.java
|
||||||
@@ -208,6 +208,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
@@ -208,6 +208,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
||||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Do not place player if the server is full
|
|||||||
Fix https://github.com/PaperMC/Paper/issues/10668
|
Fix https://github.com/PaperMC/Paper/issues/10668
|
||||||
|
|
||||||
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
|
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
|
||||||
index b24e03e941da6e90b1b8419c7f33973aebec7818..9a2e11ff1ed5b8d07b1d6c66ba1a6109c290ff8b 100644
|
index 74bbc98c700ac6c6065cf1de4d5486ac39cf0efb..837fed1c7786d6d3397f70d910cace4cdf2223ce 100644
|
||||||
--- a/net/minecraft/server/players/PlayerList.java
|
--- a/net/minecraft/server/players/PlayerList.java
|
||||||
+++ b/net/minecraft/server/players/PlayerList.java
|
+++ b/net/minecraft/server/players/PlayerList.java
|
||||||
@@ -349,6 +349,13 @@ public abstract class PlayerList {
|
@@ -349,6 +349,13 @@ public abstract class PlayerList {
|
||||||
@@ -8,7 +8,7 @@ Original project: https://github.com/PaperMC/Paper
|
|||||||
Paper pull request: https://github.com/PaperMC/Paper/pull/10990
|
Paper pull request: https://github.com/PaperMC/Paper/pull/10990
|
||||||
|
|
||||||
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
|
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
|
||||||
index e5a93f7256d904a3401a68ca8ad5962d92ed67f3..751c8c17c3c2968fad358ae8807eaca54de82a34 100644
|
index 3bd2ba1c6d4359eb03c4df908bc4c76c3cbc386d..e96605d652ca7265352ace09fd5e1892b4bbcd65 100644
|
||||||
--- a/net/minecraft/world/entity/Mob.java
|
--- a/net/minecraft/world/entity/Mob.java
|
||||||
+++ b/net/minecraft/world/entity/Mob.java
|
+++ b/net/minecraft/world/entity/Mob.java
|
||||||
@@ -210,6 +210,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
|
@@ -210,6 +210,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
|
||||||
@@ -24,7 +24,7 @@ index e5a93f7256d904a3401a68ca8ad5962d92ed67f3..751c8c17c3c2968fad358ae8807eaca5
|
|||||||
this.goalSelector.tick();
|
this.goalSelector.tick();
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
|
diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
|
||||||
index 014bb5b6e82bb11b756430999522f4b8f9356d9f..e6a750ab472eba53de1e5f9e2f507f3a0a9d94d4 100644
|
index e67f8940e2f5eb58dff3208bbc1602a1adfe4778..2c6f0d9a91367a0dc9b211b9ae9fafeb7efde315 100644
|
||||||
--- a/net/minecraft/world/entity/npc/Villager.java
|
--- a/net/minecraft/world/entity/npc/Villager.java
|
||||||
+++ b/net/minecraft/world/entity/npc/Villager.java
|
+++ b/net/minecraft/world/entity/npc/Villager.java
|
||||||
@@ -374,7 +374,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
@@ -374,7 +374,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||||||
@@ -7,7 +7,7 @@ Original license: AGPL-3.0
|
|||||||
Original project: https://github.com/snackbag/TT20
|
Original project: https://github.com/snackbag/TT20
|
||||||
|
|
||||||
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
||||||
index d8512ea61ef99587c72aa4853e91b49bd1887bf7..84d001b3bd778f20afc4a0e3c7661e6cf0afa25e 100644
|
index aaac2c85d20c0ef446787cb973b55a80c8bfeb8d..f8dd55a4a5a93788e0690b1a6a6b87d12cf26571 100644
|
||||||
--- a/net/minecraft/server/MinecraftServer.java
|
--- a/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/net/minecraft/server/MinecraftServer.java
|
+++ b/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -1542,6 +1542,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -1542,6 +1542,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
@@ -119,7 +119,7 @@ index 50bc5b940812432bc472e5b272582efb8bbfc7a7..d55677f66ec7e2d4f2a96556f874e719
|
|||||||
// Paper end - rewrite chunk system
|
// Paper end - rewrite chunk system
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
||||||
index b714b871a80b47619c81b51eec23a6f474eb3e7e..105423d248df2647d78e6f1a288e9b41003ad437 100644
|
index cbc0b9b0ed6537f0cf0997d08fbf81491bf51d1f..2dfdf64386c75557050e458fd56644f909950865 100644
|
||||||
--- a/net/minecraft/server/level/ServerLevel.java
|
--- a/net/minecraft/server/level/ServerLevel.java
|
||||||
+++ b/net/minecraft/server/level/ServerLevel.java
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
||||||
@@ -508,7 +508,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
@@ -508,7 +508,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
@@ -6,7 +6,7 @@ Subject: [PATCH] SparklyPaper: Track each world MSPT
|
|||||||
Original project: https://github.com/SparklyPower/SparklyPaper
|
Original project: https://github.com/SparklyPower/SparklyPaper
|
||||||
|
|
||||||
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
||||||
index 7d4e3946bf94bad80d2e3af4763c246bafa5cff3..f73f72548ab1c7505a8df458e0ddbf19c89bcd1e 100644
|
index b81de5b278c43a404d0f6b96cf134b401f137ab3..3531e37b784b4d61660c66cd92bc609884f78a91 100644
|
||||||
--- a/net/minecraft/server/MinecraftServer.java
|
--- a/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/net/minecraft/server/MinecraftServer.java
|
+++ b/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -1687,7 +1687,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -1687,7 +1687,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
@@ -27,7 +27,7 @@ index 7d4e3946bf94bad80d2e3af4763c246bafa5cff3..f73f72548ab1c7505a8df458e0ddbf19
|
|||||||
CrashReport crashReport = CrashReport.forThrowable(levelTickingException, "Exception ticking world");
|
CrashReport crashReport = CrashReport.forThrowable(levelTickingException, "Exception ticking world");
|
||||||
serverLevel.fillReportDetails(crashReport);
|
serverLevel.fillReportDetails(crashReport);
|
||||||
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
||||||
index 78062a93c63da07cf9d92b03fc72e97933342cc9..75f81fada6e8064add9fc04f25933d4fb8f6dcd7 100644
|
index bfb4ea9d597b5f480ca0b7c095edf5090b84211c..2352406b0284ddcfb755618837f641b059437a19 100644
|
||||||
--- a/net/minecraft/server/level/ServerLevel.java
|
--- a/net/minecraft/server/level/ServerLevel.java
|
||||||
+++ b/net/minecraft/server/level/ServerLevel.java
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
||||||
@@ -571,6 +571,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
@@ -571,6 +571,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
@@ -9,7 +9,7 @@ Leaf: ~48ms (-36%)
|
|||||||
This should help drastically on the farms that use actively changing fluids.
|
This should help drastically on the farms that use actively changing fluids.
|
||||||
|
|
||||||
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
||||||
index 75f81fada6e8064add9fc04f25933d4fb8f6dcd7..d2cbdfccd9f98516b8fa67f71c84871ee3167dd3 100644
|
index 2352406b0284ddcfb755618837f641b059437a19..284e2332ca6c0af178169f2ab9acae3c7e9d0561 100644
|
||||||
--- a/net/minecraft/server/level/ServerLevel.java
|
--- a/net/minecraft/server/level/ServerLevel.java
|
||||||
+++ b/net/minecraft/server/level/ServerLevel.java
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
||||||
@@ -1444,6 +1444,10 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
@@ -1444,6 +1444,10 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Micro optimizations for random tick
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
||||||
index d2cbdfccd9f98516b8fa67f71c84871ee3167dd3..b3d877089f4eebcd78f1019a91d9d71615a15148 100644
|
index 284e2332ca6c0af178169f2ab9acae3c7e9d0561..8a6c049c5bf39925d45778b3e297394193cb3e17 100644
|
||||||
--- a/net/minecraft/server/level/ServerLevel.java
|
--- a/net/minecraft/server/level/ServerLevel.java
|
||||||
+++ b/net/minecraft/server/level/ServerLevel.java
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
||||||
@@ -1042,7 +1042,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
@@ -1042,7 +1042,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
@@ -27,7 +27,7 @@ index 525f29f3ecd7eb12e3d7447898005d3a6d62c093..24f0d13922748eb8a96fd83f14204984
|
|||||||
public static final int GENERATED_TICKET_LEVEL = ChunkHolderManager.FULL_LOADED_TICKET_LEVEL;
|
public static final int GENERATED_TICKET_LEVEL = ChunkHolderManager.FULL_LOADED_TICKET_LEVEL;
|
||||||
public static final int LOADED_TICKET_LEVEL = ChunkTaskScheduler.getTicketLevel(ChunkStatus.EMPTY);
|
public static final int LOADED_TICKET_LEVEL = ChunkTaskScheduler.getTicketLevel(ChunkStatus.EMPTY);
|
||||||
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
|
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
|
||||||
index f4cd57fe41caf6422bfe80ee42cb520515ff4bdc..504ba8622d87c73e9a640de9b96285474685c77e 100644
|
index f61fac2767d2085c10a3d34ec475bb07d625737d..368d5c9b17689ddb885ca967cc141b405fed8cd8 100644
|
||||||
--- a/net/minecraft/server/players/PlayerList.java
|
--- a/net/minecraft/server/players/PlayerList.java
|
||||||
+++ b/net/minecraft/server/players/PlayerList.java
|
+++ b/net/minecraft/server/players/PlayerList.java
|
||||||
@@ -441,6 +441,13 @@ public abstract class PlayerList {
|
@@ -441,6 +441,13 @@ public abstract class PlayerList {
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user