Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-30 12:29:18 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2024-05-25 17:30:25 +08:00
parent 46ac3c65f8
commit a485bc9b5e
42 changed files with 132 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0011-Fakeplayer-support.patch
View File

@@ -53,10 +53,10 @@ index 02833deaa2bb7e5abc655bc1bdbe15c4b3ac7119..53c23d5bbbc5c74a35dafec99bcf13f9
if (this.packetListener != null) {
throw new IllegalStateException("Listener already set");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4a9b4e9c0db3cf86134b857ee1318fa4463c80a1..d8ac4b133c52c46494518a93884f715108dc8f17 100644
index f1f0e7adada3527ac666623d63376e6cbd590630..24362501292e61c5d1f17917f27095b6a56b661c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -670,6 +670,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -667,6 +667,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
// Paper end - Configurable player collision
@@ -65,7 +65,7 @@ index 4a9b4e9c0db3cf86134b857ee1318fa4463c80a1..d8ac4b133c52c46494518a93884f7151
this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
io.papermc.paper.command.brigadier.PaperCommands.INSTANCE.setValid(); // Paper - reset invalid state for event fire below
@@ -970,6 +972,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -967,6 +969,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
MinecraftServer.LOGGER.info("Stopping server");
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -108,7 +108,7 @@ index dc20b051d4f14ce4e0b5a0114e02d15716a7c3d6..d1a42800e069fa89d3f3fb4dcb9948d1
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c10401e587a710d49c4af481c1e531b4bf51f755..b1a32440f92f54ea86356391ecaa14c676f79eed 100644
index a645ad66af061966c5e47cae677026b35a55c486..1adceb1122a3312d70482e01f9d3054b3b88ba5d 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -194,6 +194,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -275,7 +275,7 @@ index 11d73647d2d94c8131c5e3eeef490fb3472fe0a4..ef719bf410912b24d57de422d1fa3fb2
+ // Leaves end - fakeplayer support
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 96ad6c4ae0a9f3745e4a6503e6010d9278d8eb54..082b484df1bd3d6a87413e3ab9a07a8f5401c65d 100644
index 25cfcde7eeb80d3e5ab530096b8ae947412ee282..28d388d5955eeb322b9f47ba542a23ca2264ea8e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1511,7 +1511,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -353,7 +353,7 @@ index 1b1b475ca27e799e251d6f8a8c9fe1a4fd8bae83..bb9d8cb957f5be517d3ae2959e0406af
if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper - Ability to control player's insomnia and phantoms
BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21));
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3fbf31ef07489ffb7d0c0f5317fa967db740494d..87bb3ecfbc1fc48a0c276261ea438ba43f8e9e50 100644
index 5375536a1b752f4b2a41b5e9b02d418ffdaef4c4..a99b5ab363b1acffc4c5ce3151ea28ff2c377d8d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -305,6 +305,7 @@ public final class CraftServer implements Server {
@@ -364,7 +364,7 @@ index 3fbf31ef07489ffb7d0c0f5317fa967db740494d..87bb3ecfbc1fc48a0c276261ea438ba4
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -3275,4 +3276,11 @@ public final class CraftServer implements Server {
@@ -3267,4 +3268,11 @@ public final class CraftServer implements Server {
return this.potionBrewer;
}
// Paper end