Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-19 15:09:25 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3efaf477 Add API for client-side signs (#11903)
PaperMC/Paper@a3909f54 [ci/skip] Fix bad format for jd @link (#12581)
PaperMC/Paper@7774243d Add plugin details to zip file errors (#12580)
PaperMC/Paper@220b57ad Fixs and Improvements for EndermanEscapeEvent (#12570)
PaperMC/Paper@b8fe22c9 Do not call EntityRemoveEvent during worldgen (#12588)
PaperMC/Paper@ee3b4053 Replace spigot check with generation check
PaperMC/Paper@84ee4249 Add Map filled event (#12574)
PaperMC/Paper@b9d6ba24 Expose more data for MusicInstrument (#12415)
PaperMC/Paper@a033e3b9 Fix ancient player custom name converter
This commit is contained in:
Dreeam
2025-05-26 00:58:11 +08:00
parent 5ddabb083e
commit 2815224ed9
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=cn.dreeam.leaf
mcVersion=1.21.5
version=1.21.5-R0.1-SNAPSHOT
paperCommit=b70bca6b698cfc172891d7bfa149649160d08ba2
paperCommit=a033e3b9ef78cfe85be807ac3fd1dd956274d4db
org.gradle.configuration-cache=true
org.gradle.caching=true

4
leaf-api/paper-patches/features/0013-Purpur-API-Changes.patch
View File

@@ -1017,10 +1017,10 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 868085a98ec22841d0337583ade3e4fb291abcbc..72f0c460cb06c386f2ee6228de214ae130a38cbb 100644
index c44453789834c544b0e78b52bb9b09ffbd5958fb..d4082cd6dae07958ace3b9e9769ccb7da4c2a828 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3920,4 +3920,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3935,4 +3935,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param score New death screen score of player
*/
void setDeathScreenScore(int score);

4
leaf-api/paper-patches/features/0015-KeYi-Player-Skull-API.patch
View File

@@ -7,10 +7,10 @@ Original license: MIT
Original project: https://github.com/KeYiMC/KeYi
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 953ee95c692d91e1bd222f9224ea990f9d4feca0..1f36484af62f3e6eb2b9335cc29cb6518ea29375 100644
index d4082cd6dae07958ace3b9e9769ccb7da4c2a828..d17f7881e55d61c2137f29d0b903016958b05b5d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -4039,4 +4039,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -4054,4 +4054,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
sendDeathScreen(message);
}
// Purpur end

4
leaf-api/paper-patches/features/0016-Slice-Smooth-Teleports.patch
View File

@@ -9,10 +9,10 @@ Original project: https://github.com/Cryptite/Slice
Co-authored-by: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1f36484af62f3e6eb2b9335cc29cb6518ea29375..9a3518be6de43934987140569f0df89961013e7d 100644
index d17f7881e55d61c2137f29d0b903016958b05b5d..09f70aa4d206a1b7fc5f3274f34c6885a9e2d60d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3701,6 +3701,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3716,6 +3716,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
String getClientBrandName();
// Paper end

12
leaf-server/minecraft-patches/features/0099-Purpur-Server-Minecraft-Changes.patch
View File

@@ -1284,7 +1284,7 @@ index c4f4c21f32e2aba79e15315d73124c803bb1223a..d2e8adccf33c6b842fac615006b782b0
this.player.clientBrandName = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.wrappedBuffer(data)).readUtf(256);
}
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index c6f52c899a3e4baf483412af8315d72a29f7139a..d2c1da7df4961fddbb7db952d817f127ece275d9 100644
index 68368928035ffa8fb7b12a7e3c6a7f9686379933..35ca166964e8436154891708f69ac010491b64aa 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -321,6 +321,20 @@ public class ServerGamePacketListenerImpl
@@ -8913,7 +8913,7 @@ index fd33a8b59f40299ab644a4c52921b66a9b6552ca..a708692a71014aabc1fc842837e1c0a8
return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.3F).add(Attributes.ATTACK_DAMAGE, 8.0).add(Attributes.MAX_HEALTH, 80.0);
}
diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
index 6c2bfad0ad7a5c20cd6eeba9fdc713c85c357ef4..b57f16d8faca315a2b080407e007e9a18ca3c2fc 100644
index 84a9dbf5898fb519fad5fdc3ea1d9a2054d1e0eb..16886178079a096329d06f40d502012b6fa473e0 100644
--- a/net/minecraft/world/entity/monster/EnderMan.java
+++ b/net/minecraft/world/entity/monster/EnderMan.java
@@ -88,12 +88,45 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -9008,7 +9008,7 @@ index 6c2bfad0ad7a5c20cd6eeba9fdc713c85c357ef4..b57f16d8faca315a2b080407e007e9a1
} else {
AbstractThrownPotion abstractThrownPotion1 = damageSource.getDirectEntity() instanceof AbstractThrownPotion abstractThrownPotion
? abstractThrownPotion
@@ -398,6 +434,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -400,6 +436,7 @@ public class EnderMan extends Monster implements NeutralMob {
} else {
boolean flag = abstractThrownPotion1 != null && this.hurtWithCleanWater(level, damageSource, abstractThrownPotion1, amount);
@@ -9016,7 +9016,7 @@ index 6c2bfad0ad7a5c20cd6eeba9fdc713c85c357ef4..b57f16d8faca315a2b080407e007e9a1
if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper - EndermanEscapeEvent
for (int i = 0; i < 64; i++) {
if (this.teleport()) {
@@ -441,7 +478,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -443,7 +480,7 @@ public class EnderMan extends Monster implements NeutralMob {
@Override
public boolean requiresCustomPersistence() {
@@ -9025,7 +9025,7 @@ index 6c2bfad0ad7a5c20cd6eeba9fdc713c85c357ef4..b57f16d8faca315a2b080407e007e9a1
}
static class EndermanFreezeWhenLookedAt extends Goal {
@@ -485,8 +522,9 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -487,8 +524,9 @@ public class EnderMan extends Monster implements NeutralMob {
@Override
public boolean canUse() {
@@ -9036,7 +9036,7 @@ index 6c2bfad0ad7a5c20cd6eeba9fdc713c85c357ef4..b57f16d8faca315a2b080407e007e9a1
&& this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0;
}
@@ -634,8 +672,9 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -636,8 +674,9 @@ public class EnderMan extends Monster implements NeutralMob {
@Override
public boolean canUse() {

4
leaf-server/minecraft-patches/features/0235-Async-target-finding.patch
View File

@@ -1987,10 +1987,10 @@ index 2e04078664cd723e3e0c80565e4b6e6416b13901..ed790a407b4be9e2f7fcb8cf36b8d03c
static class DrownedGoToWaterGoal extends Goal {
diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
index b57f16d8faca315a2b080407e007e9a18ca3c2fc..13d4d25191c4ed262acc54eb6d3517587846c1ae 100644
index 16886178079a096329d06f40d502012b6fa473e0..36d5621d4d92c86a6edbd088ce5e5a246cdbe5cb 100644
--- a/net/minecraft/world/entity/monster/EnderMan.java
+++ b/net/minecraft/world/entity/monster/EnderMan.java
@@ -590,10 +590,34 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -592,10 +592,34 @@ public class EnderMan extends Monster implements NeutralMob {
@Override
public boolean canUse() {

14
leaf-server/paper-patches/features/0009-Purpur-Server-Paper-Changes.patch
View File

@@ -1068,10 +1068,10 @@ index 02deb9c37250144be9afa0fe55df2a49017a7070..dfb597fcb8d01ed6cf20eae57e260949
+ // Purpur end - Llama API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8a1e2785d4a3dd6f5d97c152e9b42d5c257d1ee6..616c25e3e447923235e2586f8a74d1eca39cbb32 100644
index 1db6276ae7a547860cf2c6f85b37ec4d6b33655a..fcc7bc9098e2544588d8b36dd0cff59e6a2563bd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -611,10 +611,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -614,10 +614,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setPlayerListName(String name) {
@@ -1088,7 +1088,7 @@ index 8a1e2785d4a3dd6f5d97c152e9b42d5c257d1ee6..616c25e3e447923235e2586f8a74d1ec
if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
for (ServerPlayer player : (List<ServerPlayer>) this.server.getHandle().players) {
if (player.getBukkitEntity().canSee(this)) {
@@ -1428,6 +1433,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1431,6 +1436,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Paper start - Teleport passenger API
// Don't allow teleporting between worlds while keeping passengers
if (ignorePassengers && entity.isVehicle() && location.getWorld() != this.getWorld()) {
@@ -1096,7 +1096,7 @@ index 8a1e2785d4a3dd6f5d97c152e9b42d5c257d1ee6..616c25e3e447923235e2586f8a74d1ec
return false;
}
@@ -1449,6 +1455,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1452,6 +1458,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
@@ -1104,7 +1104,7 @@ index 8a1e2785d4a3dd6f5d97c152e9b42d5c257d1ee6..616c25e3e447923235e2586f8a74d1ec
return false;
}
@@ -2720,6 +2727,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2723,6 +2730,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}
@@ -1133,7 +1133,7 @@ index 8a1e2785d4a3dd6f5d97c152e9b42d5c257d1ee6..616c25e3e447923235e2586f8a74d1ec
private void validateSpeed(float value) {
Preconditions.checkArgument(value <= 1f && value >= -1f, "Speed value (%s) need to be between -1f and 1f", value);
}
@@ -3566,4 +3595,76 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3576,4 +3605,76 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setDeathScreenScore(final int score) {
getHandle().setScore(score);
}
@@ -1293,7 +1293,7 @@ index c3bd4cc1458bf62639d43854c2fdd0b479993b22..52a492ed8651e2ecb8b47cc3394fa4c7
+ // Purpur end - Configurable chance for wolves to spawn rabid
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 6f86a505c99010eb80e76e2fbe36414fcde80a39..3a3fbbfa0b82092cd9ac8eab2d179fb9f590aec8 100644
index 9774c9c72a910ccd919b903d92f4068c06d199d7..5300a513a295d472752d31a6e8af48bb64b06704 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -514,6 +514,15 @@ public class CraftEventFactory {

4
leaf-server/paper-patches/features/0028-KeYi-Player-Skull-API.patch
View File

@@ -7,10 +7,10 @@ Original license: MIT
Original project: https://github.com/KeYiMC/KeYi
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 616c25e3e447923235e2586f8a74d1eca39cbb32..ce96e14ac8b2ebb8c651360564b75c9dacb496e8 100644
index fcc7bc9098e2544588d8b36dd0cff59e6a2563bd..3baf8e5508ba6acf4331b23832dac0316cb93ca1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3667,4 +3667,31 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3677,4 +3677,31 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket(getEntityId(), io.papermc.paper.adventure.PaperAdventure.asVanilla(message)));
}
// Purpur end - Death screen API

4
leaf-server/paper-patches/features/0029-Slice-Smooth-Teleports.patch
View File

@@ -9,10 +9,10 @@ Original project: https://github.com/Cryptite/Slice
Co-authored-by: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ce96e14ac8b2ebb8c651360564b75c9dacb496e8..ba42606bb754aaad29eec238ccc1acac3f47683e 100644
index 3baf8e5508ba6acf4331b23832dac0316cb93ca1..03c93d7f17a0c5440cb1d8078e3e241cbd1f1c41 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1378,6 +1378,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1381,6 +1381,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Paper end - Teleportation API
}

6
leaf-server/paper-patches/features/0032-SparklyPaper-Optimize-canSee-checks.patch
View File

@@ -16,10 +16,10 @@ This seems stupid, but it does seem that it improves the performance a bit, and
We also create a "canSee" method tailored for "ChunkMap#updatePlayer()", a method without the equals check (the "updatePlayer()" already checks if the entity is the same entity) because the CraftPlayer's `equals()` check is a *bit* expensive compared to only checking the object's identity, and because the identity has already been check, we don't need to check it twice.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ba42606bb754aaad29eec238ccc1acac3f47683e..e95510055134be9c85f43b0640b6ac9feba73780 100644
index 03c93d7f17a0c5440cb1d8078e3e241cbd1f1c41..cab15624afaeaca5d69206a0b7fff5da54e5ef29 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -213,7 +213,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -216,7 +216,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private boolean hasPlayedBefore = false;
private final ConversationTracker conversationTracker = new ConversationTracker();
private final Set<String> channels = new HashSet<String>();
@@ -28,7 +28,7 @@ index ba42606bb754aaad29eec238ccc1acac3f47683e..e95510055134be9c85f43b0640b6ac9f
private final Set<UUID> unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player
private static final WeakHashMap<Plugin, WeakReference<Plugin>> pluginWeakReferences = new WeakHashMap<>();
private int hash = 0;
@@ -2285,9 +2285,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2288,9 +2288,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public boolean canSee(org.bukkit.entity.Entity entity) {