Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-04 15:41:31 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2023-11-15 00:27:50 +08:00
parent 67e3c6d6da
commit c5b1beaecb
15 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0111-Replay-Mod-API.patch
View File

@@ -107,7 +107,7 @@ index fbd602b5219c0eeefea36dbaca7aae10d483a152..e05620a5fa75e22001511fff205b718b
}
// Leaves end - bot can't get advancement
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 2f03a0114177a461b7bfb3475687b2f32522e794..498a16efd36deb71d0419104cc9946c88824b8cb 100644
index afbefe01fe7b4a129d8bd471658d5ee64507477e..2277e70b2adacad0341d07da718ce3110253926e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -300,7 +300,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -334,10 +334,10 @@ index 1bc21038e33faa9c1f24acedabeb84741e31de05..dc7b69f429cc9b19080fa05c6135175d
this.server.getCustomBossEvents().onPlayerDisconnect(entityplayer);
UUID uuid = entityplayer.getUUID();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 96122de9875889efb1b14f2d1d23ef19d54b5453..4517f70979e87040d89081befe243e57de88786f 100644
index be41bc7bad37ccfb9d9b7a268a4a702db8c66f4f..f956ce593fe468a4cd4a6f7dfd221276178f3b58 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -263,6 +263,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -265,6 +265,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
import net.md_5.bungee.api.chat.BaseComponent; // Spigot
import top.leavesmc.leaves.entity.CraftBotManager;
@@ -345,7 +345,7 @@ index 96122de9875889efb1b14f2d1d23ef19d54b5453..4517f70979e87040d89081befe243e57
import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
@@ -309,6 +310,7 @@ public final class CraftServer implements Server {
@@ -311,6 +312,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
private final CraftBotManager botManager = new CraftBotManager();
@@ -353,7 +353,7 @@ index 96122de9875889efb1b14f2d1d23ef19d54b5453..4517f70979e87040d89081befe243e57
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -390,7 +392,7 @@ public final class CraftServer implements Server {
@@ -392,7 +394,7 @@ public final class CraftServer implements Server {
public CraftServer(DedicatedServer console, PlayerList playerList) {
this.console = console;
this.playerList = (DedicatedPlayerList) playerList;
@@ -362,7 +362,7 @@ index 96122de9875889efb1b14f2d1d23ef19d54b5453..4517f70979e87040d89081befe243e57
@Override
public CraftPlayer apply(ServerPlayer player) {
return player.getBukkitEntity();
@@ -3155,4 +3157,11 @@ public final class CraftServer implements Server {
@@ -3218,4 +3220,11 @@ public final class CraftServer implements Server {
return botManager;
}
// Leaves end - Bot API
@@ -375,7 +375,7 @@ index 96122de9875889efb1b14f2d1d23ef19d54b5453..4517f70979e87040d89081befe243e57
+ // Leaves end - replay mod api
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 3a9430ab1661ee36985a4cee4289e84c1b254cdc..f55d0c376396c53e29748b8066bcf3a8dd3b42db 100644
index f1343e71eaf0592b4efa5ba5d60cb5e9973f71e1..98789c4649e4b81cfdd5d80f2fcb707806fde057 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -198,6 +198,8 @@ import top.leavesmc.leaves.bot.ServerBot;