Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-19 14:59:32 +00:00
Code Issues Releases Activity

Update Paper, and not pre

Browse Source
This commit is contained in:
violetc
2025-08-20 16:50:33 +08:00
parent 13c4e25e4b
commit 0ad976f6b5
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -1,9 +1,9 @@
group=org.leavesmc.leaves group=org.leavesmc.leaves
version=1.21.8-R0.1-SNAPSHOT version=1.21.8-R0.1-SNAPSHOT
mcVersion=1.21.8 mcVersion=1.21.8
paperRef=86b716bc5ba5e6345576a1437bd80b6b70082315 paperRef=f866a5fd5497798590aebefb99e417c97a8e1e76
preVersion=true preVersion=false
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=true org.gradle.parallel=true

4
leaves-server/minecraft-patches/features/0101-Disable-crystal-portal-proximity-check.patch
View File

@@ -27,7 +27,7 @@ index 05ec512839898f96d9769bb0d00f6ba11dda0c4b..27b225344c34e561d4913b3a6ca1c4a4
} }
diff --git a/net/minecraft/world/level/dimension/end/EndDragonFight.java b/net/minecraft/world/level/dimension/end/EndDragonFight.java diff --git a/net/minecraft/world/level/dimension/end/EndDragonFight.java b/net/minecraft/world/level/dimension/end/EndDragonFight.java
index 18a567b676f0bfcd725f19c5ed9e3fdbc8e65573..ffcd4bf2e8186ae7022f77131dc83c0006a9e1e4 100644 index 37d74a98689166355e7ed6165f1611cdb8cd1db7..7d7656cf8fdec9073ad3a1d026cbeb1f2f297d6a 100644
--- a/net/minecraft/world/level/dimension/end/EndDragonFight.java --- a/net/minecraft/world/level/dimension/end/EndDragonFight.java
+++ b/net/minecraft/world/level/dimension/end/EndDragonFight.java +++ b/net/minecraft/world/level/dimension/end/EndDragonFight.java
@@ -576,12 +576,14 @@ public class EndDragonFight { @@ -576,12 +576,14 @@ public class EndDragonFight {
@@ -51,7 +51,7 @@ index 18a567b676f0bfcd725f19c5ed9e3fdbc8e65573..ffcd4bf2e8186ae7022f77131dc83c00
} }
+ /* Leaves + /* Leaves
// Paper start - Perf: Do crystal-portal proximity check before entity lookup // Paper start - Perf: Do crystal-portal proximity check before entity lookup
if (placedEndCrystalPos != null) { if (placedEndCrystalPos != null && !level.paperConfig().misc.allowRemoteEnderDragonRespawning) {
// The end crystal must be 0 or 1 higher than the portal origin // The end crystal must be 0 or 1 higher than the portal origin
@@ -611,7 +614,7 @@ public class EndDragonFight { @@ -611,7 +614,7 @@ public class EndDragonFight {
} }

14
leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch
View File

@@ -85,10 +85,10 @@ index 203ea4231e5b0d3bf7c35856ca55b2f812044608..8ec1308877f82c1207867429f2d5d3e3
+ // Leaves end - Bot API + // Leaves end - Bot API
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index aa0a61d7f3128543b698647663fa4a9af2a8255a..9e80b890ecf677dc3c288afecfd125687c7f32f6 100644 index ee7a4169003b23766b5d2e6edf9221375d80d83c..e0851fc1fa599c2a35d15c7fec7959cb33bb3562 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -248,7 +248,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -249,7 +249,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override @Override
public int getPlayerCount() { public int getPlayerCount() {
@@ -97,7 +97,7 @@ index aa0a61d7f3128543b698647663fa4a9af2a8255a..9e80b890ecf677dc3c288afecfd12568
} }
@Override @Override
@@ -1265,9 +1265,9 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -1266,9 +1266,9 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override @Override
public List<Player> getPlayers() { public List<Player> getPlayers() {
@@ -109,7 +109,7 @@ index aa0a61d7f3128543b698647663fa4a9af2a8255a..9e80b890ecf677dc3c288afecfd12568
HumanEntity bukkitEntity = human.getBukkitEntity(); HumanEntity bukkitEntity = human.getBukkitEntity();
if ((bukkitEntity != null) && (bukkitEntity instanceof Player)) { if ((bukkitEntity != null) && (bukkitEntity instanceof Player)) {
@@ -1949,7 +1949,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -1950,7 +1950,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
public void playSound(final net.kyori.adventure.sound.Sound sound) { public void playSound(final net.kyori.adventure.sound.Sound sound) {
org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
final long seed = sound.seed().orElseGet(this.world.getRandom()::nextLong); final long seed = sound.seed().orElseGet(this.world.getRandom()::nextLong);
@@ -118,7 +118,7 @@ index aa0a61d7f3128543b698647663fa4a9af2a8255a..9e80b890ecf677dc3c288afecfd12568
player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player.getX(), player.getY(), player.getZ(), seed, null)); player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player.getX(), player.getY(), player.getZ(), seed, null));
} }
} }
@@ -1977,7 +1977,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -1978,7 +1978,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
final long seed = sound.seed().orElseGet(this.getHandle().getRandom()::nextLong); final long seed = sound.seed().orElseGet(this.getHandle().getRandom()::nextLong);
if (emitter == net.kyori.adventure.sound.Sound.Emitter.self()) { if (emitter == net.kyori.adventure.sound.Sound.Emitter.self()) {
@@ -127,7 +127,7 @@ index aa0a61d7f3128543b698647663fa4a9af2a8255a..9e80b890ecf677dc3c288afecfd12568
player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player, seed, null)); player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player, seed, null));
} }
} else if (emitter instanceof CraftEntity craftEntity) { } else if (emitter instanceof CraftEntity craftEntity) {
@@ -2207,7 +2207,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -2208,7 +2208,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType()); Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
} }
this.getHandle().sendParticlesSource( this.getHandle().sendParticlesSource(
@@ -150,7 +150,7 @@ index b38073628d3b1381ccc4e5c6c44b2b7ec8ba1273..c775b2956d008338d7d48ab709013b71
if (entity instanceof EnderDragonPart complexPart) { if (entity instanceof EnderDragonPart complexPart) {
if (complexPart.parentMob instanceof EnderDragon) { if (complexPart.parentMob instanceof EnderDragon) {
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 183d83f023644c9c5dba0702ba2464566e74ad32..50b546cf6a1483e6721d7fd8ef029fb3abd1eacc 100644 index 08db922da37984b82f57c210f6613543d32303bc..f4fc9723958d3e2d78244ec93efa1b767793d6cc 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -896,7 +896,11 @@ public class CraftEventFactory { @@ -896,7 +896,11 @@ public class CraftEventFactory {