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 
And FIX PR COMMIT NAME
This commit is contained in:
violetc
2024-04-24 13:42:15 +08:00
parent a4724baccf
commit 94d5a2b7be
43 changed files with 288 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0010-Fakeplayer-support.patch
View File

@@ -22,10 +22,10 @@ index a1c9726d25479b5326fe2fa2b0f5a98d6b2da4c5..ee17f012497fa75e152bc279cb3f7778
RegisteredListener[] listeners = handlers.getRegisteredListeners();
diff --git a/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java b/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
index a327973e37b5b8d4e15683ef24548482ac3dc3d5..65d82963d611a6dbbd7ca58d363854e4fad59230 100644
index 35772110e9318df46a2729dbc0b5879b290011b7..0d4ad3666efaa7cc8df81b1c698e4a45586d3795 100644
--- a/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
+++ b/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
@@ -42,6 +42,7 @@ public abstract class SimpleCriterionTrigger<T extends SimpleCriterionTrigger.Si
@@ -39,6 +39,7 @@ public abstract class SimpleCriterionTrigger<T extends SimpleCriterionTrigger.Si
}
protected void trigger(ServerPlayer player, Predicate<T> predicate) {
@@ -34,10 +34,10 @@ index a327973e37b5b8d4e15683ef24548482ac3dc3d5..65d82963d611a6dbbd7ca58d363854e4
Set<CriterionTrigger.Listener<T>> set = (Set) playerAdvancements.criterionData.get(this); // Paper - fix AdvancementDataPlayer leak
if (set != null && !set.isEmpty()) {
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
index 4716f8bd8a64d4f20f0d5957c1e7fabf63020f43..13b0a965eaee5ba2f6da420c3c02dc719fa73dd6 100644
index a536ebcf29d8ef0ed32863bd8d5e70f7a0636e8d..35d03c7128e0cc9b3e0a9ecf109c17dab927c4a4 100644
--- a/src/main/java/net/minecraft/network/Connection.java
+++ b/src/main/java/net/minecraft/network/Connection.java
@@ -339,6 +339,14 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -340,6 +340,14 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
}
}
@@ -53,7 +53,7 @@ index 4716f8bd8a64d4f20f0d5957c1e7fabf63020f43..13b0a965eaee5ba2f6da420c3c02dc71
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 77e952a502bebfb31311b47ceed0b88118278d4a..91d82c02eb152e3565e52fc1e01ce37855a39bdd 100644
index f7a3a8933b9714ca65e48dd92c979bcef9535172..2841d4f57c39a52bf11023500a91bc51019ac172 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -663,6 +663,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -108,7 +108,7 @@ index 295edf4e84699fc555048b7e59aebee83e854096..137855a2b18923cce802e8ef37f97637
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 58591bf2f63b9c5e97d9ce4188dff3366968a178..42b5d67e17cc62eb830ae4b3a930b48ae64dd11e 100644
index b3781efbd3edcf102fe1bda5d6149915dc1127c6..f0d8c75c921364564b30c8dca457a61ec9b8df3f 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -186,6 +186,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -191,7 +191,7 @@ index 58591bf2f63b9c5e97d9ce4188dff3366968a178..42b5d67e17cc62eb830ae4b3a930b48a
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index beb1946f5e21ba8f15c908ff0da592d48089263d..2b03d38f1340beff57d9204e058a3a17ce662731 100644
index 03eba1b13288dfaaeca9a3eef68a1e0d3d71ccb6..81bcbb426b75bdd1151fb26ed504217165f4935e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -297,7 +297,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -294,7 +294,7 @@ index 62d89e49dfcbb00651df7f89be482b9cbc173b0a..44b354431a9c21166211e6d1de1ce573
+ // 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 87b0eead81c06afa276b74bf1c7fce573027702f..0a8ad5a68e161e6991edafe31ceeeecc10ea8dab 100644
index ae37474ca2c0484d974364e9758f73e92ce8a39a..98bab45b0dbd053ec1a0b87e3446b00da04ef300 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1469,7 +1469,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -405,7 +405,7 @@ index 79874b67f7edb9afd41633f5bc4bacee5cb0046b..79c10c26e9a27b120070b408e261a26b
+ // Leaves end - Bot API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 0b5a31477e3b76833fb97a455842316193663c8e..76e4d5b788e1049120e415906bb79e9f222148b2 100644
index e8e4489bcd64fde1b3226bdc7a7cc612508bda3f..12f8ed45dc280a9ad7e975b1922cc9309c3d53b8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -55,6 +55,8 @@ import org.bukkit.plugin.Plugin;
@@ -458,7 +458,7 @@ index cb427686bf77366ddc9ad133b08f42b6b34fb0f5..19ee86e42d92c33cb7e35ba07927883d
// Leaves start - modify - minecraft-old
diff --git a/src/main/java/top/leavesmc/leaves/bot/BotCommand.java b/src/main/java/top/leavesmc/leaves/bot/BotCommand.java
new file mode 100644
index 0000000000000000000000000000000000000000..fd8a1306f3179d0729a4a543405ac210acefe8d9
index 0000000000000000000000000000000000000000..82f29d2ead96315df1b3747ff0e5bc0ee016131b
--- /dev/null
+++ b/src/main/java/top/leavesmc/leaves/bot/BotCommand.java
@@ -0,0 +1,405 @@