Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-03 22:26:12 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2024-02-21 13:55:54 +08:00
parent 68b0d86673
commit 55b133a058
35 changed files with 131 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0106-Replay-Mod-API.patch
View File

@@ -133,7 +133,7 @@ index 2e2a7c2cf3081187da817479a9da3eb10f662a6d..ee616fe98c98a345872c1eadf41c7852
}).map((player) -> {
return player.getGameProfile().getName();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 36411cc6c1d375cc7584daa8aa6ebb8caba7ad8a..2030ae4806070b2ea1dc50a0f5286d1e0010dcd1 100644
index 0e6cec7fd2ed5b8a647678a0d5ab783e3fe10d43..3e212eb7a16309511f644170055c282e3d15f9b5 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -299,7 +299,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -369,10 +369,10 @@ index 3bec06ed4b47af1b40ba4fef264ef7b3d643fbf1..fdb4f4f8079ed680fc8deb068a5e2f0c
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f935e286103618401726481b512794430bc26c8a..fc7f5ecebcc15834d7d1348f8882fd2f0c48a4a0 100644
index 412d8201906d3a0915a32837944e960b151a5605..2e9c8ce754fa68121e2acbc4cd6ba828b39b7558 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -260,6 +260,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -262,6 +262,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
import net.md_5.bungee.api.chat.BaseComponent; // Spigot
import top.leavesmc.leaves.entity.CraftBotManager;
@@ -380,7 +380,7 @@ index f935e286103618401726481b512794430bc26c8a..fc7f5ecebcc15834d7d1348f8882fd2f
import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
@@ -307,6 +308,7 @@ public final class CraftServer implements Server {
@@ -309,6 +310,7 @@ public final class CraftServer implements Server {
private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
private final CraftPotionBrewer potionBrewer = new CraftPotionBrewer(); // Paper - Custom Potion Mixes
private final CraftBotManager botManager = new CraftBotManager();
@@ -388,7 +388,7 @@ index f935e286103618401726481b512794430bc26c8a..fc7f5ecebcc15834d7d1348f8882fd2f
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -388,7 +390,7 @@ public final class CraftServer implements Server {
@@ -390,7 +392,7 @@ public final class CraftServer implements Server {
public CraftServer(DedicatedServer console, PlayerList playerList) {
this.console = console;
this.playerList = (DedicatedPlayerList) playerList;
@@ -397,7 +397,7 @@ index f935e286103618401726481b512794430bc26c8a..fc7f5ecebcc15834d7d1348f8882fd2f
@Override
public CraftPlayer apply(ServerPlayer player) {
return player.getBukkitEntity();
@@ -3252,4 +3254,11 @@ public final class CraftServer implements Server {
@@ -3264,4 +3266,11 @@ public final class CraftServer implements Server {
return botManager;
}
// Leaves end - Bot API
@@ -431,10 +431,10 @@ index dc7ba0ce76031e6dd7e550ceaf3b2f97cbc307f1..ca4a3830e2c57107921be7eef6f15f36
// Special case complex part, since there is no extra entity type for them
if (entity instanceof EnderDragonPart complexPart) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 39b25c2478eadd373383a3445a7f27ea30d18550..0a1190e7331de715a2568ad7911fdb180c0f13ed 100644
index 206520f6f20b2e48b1eefdd4edb26510b88e4c92..e5ffd43289e67fa2bfd30bf8b8e2e88272b7a0e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2106,7 +2106,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2136,7 +2136,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public boolean canSee(Player player) {