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

Security Update

Browse Source
This commit is contained in:
violetc
2025-08-01 22:10:14 +08:00
parent f553c53e42
commit b04ebcbbf5
21 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group=org.leavesmc.leaves
version=1.21.4-R0.1-SNAPSHOT
mcVersion=1.21.4
paperRef=9b1798d6438107fdf0d5939b79a8cf71f4d16e2c
paperRef=6abf5f0b747db2d9d098d5d35f4859f68f20c867
preVersion=false
org.gradle.caching=true
org.gradle.parallel=true

2
leaves-server/build.gradle.kts.patch
View File

@@ -12,7 +12,7 @@
+val leavesMavenPublicUrl = "https://repo.leavesmc.com/snapshots/"
dependencies {
mache("io.papermc:mache:1.21.4+build.7")
mache("io.papermc:mache:1.21.4+build.8")
- paperclip("io.papermc:paperclip:3.0.3")
+ leavesclip("org.leavesmc:leavesclip:2.0.1") // Leaves - build change
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

14
leaves-server/minecraft-patches/features/0006-Leaves-Fakeplayer.patch
View File

@@ -85,7 +85,7 @@ index bde8ddadd3930100d1e31e630f809e77d6a70dac..073d4a57f78dc18e4cf95bdb852877b8
@Override
public void close() {
diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
index 64dbee1f67eaa17c93c13bfa38fbe27de57651e4..459e59c370a729dfeed3872f3a5984dd3da96abe 100644
index 2a60512bcf922e1356d7de0e4fce337c46d1315b..9f4cf7288ac2bc06b16c589354e44f731d690ee8 100644
--- a/net/minecraft/server/PlayerAdvancements.java
+++ b/net/minecraft/server/PlayerAdvancements.java
@@ -168,6 +168,11 @@ public class PlayerAdvancements {
@@ -131,7 +131,7 @@ index b3f498558614243cf633dcd71e3c49c2c55e6e0f..36c0a690e7e9b301c5a3d63fae2c7cbe
}
}
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
index 60425aade859c03ec21669b33d6b5096e444f6e9..9fba04e8a8e95546f7d7cc1210b4b324c86d2b87 100644
index 77d9c68a42097a6547807db865decf3d8e142e1a..cd4d90d546f0426ace7460002f19d15947d06ed9 100644
--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
@@ -215,6 +215,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -188,7 +188,7 @@ index 60425aade859c03ec21669b33d6b5096e444f6e9..9fba04e8a8e95546f7d7cc1210b4b324
}
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index 3de65c4025be91d938a350c884975cb6edc234d3..339cec1f040d47bb37834c6ebe0633b7c991e0cd 100644
index 60966b42131c4802e49e838451ff688665e7301e..a86d63ffc53d1af12f55be9592b0259667d5c367 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -197,7 +197,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -200,7 +200,7 @@ index 3de65c4025be91d938a350c884975cb6edc234d3..339cec1f040d47bb37834c6ebe0633b7
private final PlayerAdvancements advancements;
private final ServerStatsCounter stats;
private float lastRecordedHealthAndAbsorption = Float.MIN_VALUE;
@@ -1469,6 +1469,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -1463,6 +1463,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
this.lastSentHealth = -1.0F;
this.lastSentFood = -1;
@@ -369,10 +369,10 @@ index 1e012c7ef699a64ff3f1b00f897bb893ab25ecbd..f2bf0cdbd29438ca51b74ae2fcdf49db
public int timeUntilHooked;
public float fishAngle;
diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
index acca8c51d2030c675c157b10d0bbc6af631afe61..b4721c4e81cc2ae989765d86bd51ebf0be41758c 100644
index 50af953a4698a3c6e16b840fab764dd733b3fbc9..b7285c67ce3f6db2fa23a6dc91fcfa6a3d19f9b4 100644
--- a/net/minecraft/world/inventory/AbstractContainerMenu.java
+++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
@@ -375,6 +375,7 @@ public abstract class AbstractContainerMenu {
@@ -365,6 +365,7 @@ public abstract class AbstractContainerMenu {
private void doClick(int slotId, int button, ClickType clickType, Player player) {
Inventory inventory = player.getInventory();
@@ -380,7 +380,7 @@ index acca8c51d2030c675c157b10d0bbc6af631afe61..b4721c4e81cc2ae989765d86bd51ebf0
if (clickType == ClickType.QUICK_CRAFT) {
int i = this.quickcraftStatus;
this.quickcraftStatus = getQuickcraftHeader(button);
@@ -651,6 +652,22 @@ public abstract class AbstractContainerMenu {
@@ -641,6 +642,22 @@ public abstract class AbstractContainerMenu {
}
}

8
leaves-server/minecraft-patches/features/0030-Player-operation-limiter.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Player operation limiter
This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index 339cec1f040d47bb37834c6ebe0633b7c991e0cd..b18a818e4d795b6fb269ad57ffb49840c8d879ab 100644
index a86d63ffc53d1af12f55be9592b0259667d5c367..f74eaf852ed5d111dd318bce5290a6c319d22c40 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -400,6 +400,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -393,6 +393,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
public @Nullable String clientBrandName = null; // Paper - Brand support
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
@@ -20,7 +20,7 @@ index 339cec1f040d47bb37834c6ebe0633b7c991e0cd..b18a818e4d795b6fb269ad57ffb49840
// Paper start - rewrite chunk system
private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
@@ -805,6 +809,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -798,6 +802,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
}
// CraftBukkit end
this.tickClientLoadTimeout();
@@ -28,7 +28,7 @@ index 339cec1f040d47bb37834c6ebe0633b7c991e0cd..b18a818e4d795b6fb269ad57ffb49840
this.gameMode.tick();
this.wardenSpawnTracker.tick();
if (this.invulnerableTime > 0) {
@@ -3090,4 +3095,31 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -3084,4 +3089,31 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity();
}
// CraftBukkit end

28
leaves-server/minecraft-patches/features/0032-Stackable-ShulkerBoxes.patch
View File

@@ -39,10 +39,10 @@ index 8b7af734ca4ed3cafa810460b2cea6c1e6342a69..10d20e945a8f9e676137e752e357ad71
if (count > i) {
source.sendFailure(Component.translatable("commands.give.failed.toomanyitems", i, itemStack.getDisplayName()));
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 876d207996724727ca26b139af759eab2e6f4131..c1d55857e4238e78703eebf62af8bf59c660e9ea 100644
index a2c70d36f79b7f8560923e098e52fa7f82ca7416..b880b026e53fd516c48315c0ce46a31cd439ab47 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2987,7 +2987,7 @@ public class ServerGamePacketListenerImpl
@@ -2988,7 +2988,7 @@ public class ServerGamePacketListenerImpl
} else if (slot.mayPlace(cursor)) {
if (ItemStack.isSameItemSameComponents(clickedItem, cursor)) {
int toPlace = packet.getButtonNum() == 0 ? cursor.getCount() : 1;
@@ -51,7 +51,7 @@ index 876d207996724727ca26b139af759eab2e6f4131..c1d55857e4238e78703eebf62af8bf59
toPlace = Math.min(toPlace, slot.container.getMaxStackSize() - clickedItem.getCount());
if (toPlace == 1) {
action = InventoryAction.PLACE_ONE;
@@ -3023,7 +3023,7 @@ public class ServerGamePacketListenerImpl
@@ -3024,7 +3024,7 @@ public class ServerGamePacketListenerImpl
}
} else if (ItemStack.isSameItemSameComponents(cursor, clickedItem)) {
if (clickedItem.getCount() >= 0) {
@@ -60,7 +60,7 @@ index 876d207996724727ca26b139af759eab2e6f4131..c1d55857e4238e78703eebf62af8bf59
// As of 1.5, this is result slots only
action = InventoryAction.PICKUP_ALL;
}
@@ -3283,6 +3283,7 @@ public class ServerGamePacketListenerImpl
@@ -3284,6 +3284,7 @@ public class ServerGamePacketListenerImpl
this.player.containerMenu.broadcastFullState();
} else {
this.player.containerMenu.broadcastChanges();
@@ -68,7 +68,7 @@ index 876d207996724727ca26b139af759eab2e6f4131..c1d55857e4238e78703eebf62af8bf59
}
if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.updateEquipmentOnPlayerActions) this.player.detectEquipmentUpdatesPublic(); // Paper - Force update attributes.
}
@@ -3395,7 +3396,7 @@ public class ServerGamePacketListenerImpl
@@ -3396,7 +3397,7 @@ public class ServerGamePacketListenerImpl
}
boolean flag1 = packet.slotNum() >= 1 && packet.slotNum() <= 45;
@@ -256,10 +256,10 @@ index c18aea2bb5ddddadbc858b253ff4c08d82178a18..6a24b442a21298ef3bdbcb76de9bdcf0
default SlotAccess getChestVehicleSlot(final int index) {
diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
index b4721c4e81cc2ae989765d86bd51ebf0be41758c..d03348c8139c398b65a2f4e4f960832c797e0443 100644
index b7285c67ce3f6db2fa23a6dc91fcfa6a3d19f9b4..0fbedd33f036f5aecbe5e7ab3935785c0d645977 100644
--- a/net/minecraft/world/inventory/AbstractContainerMenu.java
+++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
@@ -427,7 +427,7 @@ public abstract class AbstractContainerMenu {
@@ -417,7 +417,7 @@ public abstract class AbstractContainerMenu {
&& (this.quickcraftType == 2 || carried1.getCount() >= this.quickcraftSlots.size())
&& this.canDragTo(slot1)) {
int i2 = slot1.hasItem() ? slot1.getItem().getCount() : 0;
@@ -268,7 +268,7 @@ index b4721c4e81cc2ae989765d86bd51ebf0be41758c..d03348c8139c398b65a2f4e4f960832c
int min1 = Math.min(getQuickCraftPlaceCount(this.quickcraftSlots, this.quickcraftType, itemStack) + i2, min);
count -= min1 - i2;
// slot1.setByPlayer(itemStack.copyWithCount(min1));
@@ -541,7 +541,7 @@ public abstract class AbstractContainerMenu {
@@ -531,7 +531,7 @@ public abstract class AbstractContainerMenu {
slot.setByPlayer(carried2);
}
} else if (ItemStack.isSameItemSameComponents(carried, carried2)) {
@@ -277,7 +277,7 @@ index b4721c4e81cc2ae989765d86bd51ebf0be41758c..d03348c8139c398b65a2f4e4f960832c
optional1.ifPresent(stack -> {
carried2.grow(stack.getCount());
slot.onTake(player, stack);
@@ -603,7 +603,7 @@ public abstract class AbstractContainerMenu {
@@ -593,7 +593,7 @@ public abstract class AbstractContainerMenu {
Slot slot2 = this.slots.get(slotId);
if (slot2.hasItem()) {
ItemStack itemStack = slot2.getItem();
@@ -286,7 +286,7 @@ index b4721c4e81cc2ae989765d86bd51ebf0be41758c..d03348c8139c398b65a2f4e4f960832c
}
} else if (clickType == ClickType.THROW && this.getCarried().isEmpty() && slotId >= 0) {
Slot slot2 = this.slots.get(slotId);
@@ -634,15 +634,15 @@ public abstract class AbstractContainerMenu {
@@ -624,15 +624,15 @@ public abstract class AbstractContainerMenu {
int maxStackSize = button == 0 ? 1 : -1;
for (int i3 = 0; i3 < 2; i3++) {
@@ -305,7 +305,7 @@ index b4721c4e81cc2ae989765d86bd51ebf0be41758c..d03348c8139c398b65a2f4e4f960832c
itemStack.grow(itemStack1.getCount());
}
}
@@ -760,7 +760,7 @@ public abstract class AbstractContainerMenu {
@@ -750,7 +750,7 @@ public abstract class AbstractContainerMenu {
i = endIndex - 1;
}
@@ -314,7 +314,7 @@ index b4721c4e81cc2ae989765d86bd51ebf0be41758c..d03348c8139c398b65a2f4e4f960832c
while (!stack.isEmpty() && (reverseDirection ? i >= startIndex : i < endIndex)) {
Slot slot = this.slots.get(i);
ItemStack item = slot.getItem();
@@ -861,7 +861,7 @@ public abstract class AbstractContainerMenu {
@@ -851,7 +851,7 @@ public abstract class AbstractContainerMenu {
public static boolean canItemQuickReplace(@Nullable Slot slot, ItemStack stack, boolean stackSizeMatters) {
boolean flag = slot == null || !slot.hasItem();
return !flag && ItemStack.isSameItemSameComponents(stack, slot.getItem())
@@ -323,7 +323,7 @@ index b4721c4e81cc2ae989765d86bd51ebf0be41758c..d03348c8139c398b65a2f4e4f960832c
: flag;
}
@@ -869,7 +869,7 @@ public abstract class AbstractContainerMenu {
@@ -859,7 +859,7 @@ public abstract class AbstractContainerMenu {
return switch (type) {
case 0 -> Mth.floor((float)stack.getCount() / slots.size());
case 1 -> 1;
@@ -332,7 +332,7 @@ index b4721c4e81cc2ae989765d86bd51ebf0be41758c..d03348c8139c398b65a2f4e4f960832c
default -> stack.getCount();
};
}
@@ -891,7 +891,7 @@ public abstract class AbstractContainerMenu {
@@ -881,7 +881,7 @@ public abstract class AbstractContainerMenu {
for (int i = 0; i < container.getContainerSize(); i++) {
ItemStack item = container.getItem(i);
if (!item.isEmpty()) {

4
leaves-server/minecraft-patches/features/0033-MC-Technical-Survival-Mode.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] MC Technical Survival Mode
Will automatically overwrite some configuration after startup
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index b18a818e4d795b6fb269ad57ffb49840c8d879ab..0df1160ce4e027cc1c1bf7071a4d8730aaa7fde6 100644
index f74eaf852ed5d111dd318bce5290a6c319d22c40..a513e9d6fa633f7329aa8bca2e42548372da8f68 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -1687,7 +1687,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -1681,7 +1681,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
public boolean isInvulnerableTo(ServerLevel level, DamageSource damageSource) {
return (super.isInvulnerableTo(level, damageSource) // Paper - disable player cramming;
|| this.isChangingDimension() && !damageSource.is(DamageTypes.ENDER_PEARL)

4
leaves-server/minecraft-patches/features/0034-Return-nether-portal-fix.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Return nether portal fix
This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index 0df1160ce4e027cc1c1bf7071a4d8730aaa7fde6..eba1717566a8ea534bbf149e0593cc7656df2db9 100644
index a513e9d6fa633f7329aa8bca2e42548372da8f68..2b8eb0f0aae8c6534b124012e26bf683929131a8 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -1484,6 +1484,21 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -1478,6 +1478,21 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
org.bukkit.event.player.PlayerChangedWorldEvent changeEvent = new org.bukkit.event.player.PlayerChangedWorldEvent(this.getBukkitEntity(), serverLevel.getWorld());
this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
// CraftBukkit end

4
leaves-server/minecraft-patches/features/0040-Disable-distance-check-for-UseItemOnPacket.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable distance check for UseItemOnPacket
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 771abbc4aeea227b99b069d9d6f58a6b8df4ee5d..19d8998ca4e2a61bcc5c33b2a6fff6ee8deb56c4 100644
index b880b026e53fd516c48315c0ce46a31cd439ab47..e13c3a2ff91a149aab0959bf187bc2981178def7 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1929,7 +1929,7 @@ public class ServerGamePacketListenerImpl
@@ -1930,7 +1930,7 @@ public class ServerGamePacketListenerImpl
if (this.player.canInteractWithBlock(blockPos, 1.0)) {
Vec3 vec3 = location.subtract(Vec3.atCenterOf(blockPos));
double d = 1.0000001;

6
leaves-server/minecraft-patches/features/0061-Reduce-array-allocations.patch
View File

@@ -138,7 +138,7 @@ index 364ddf9f25ef3cb97ba788c469fee9dd495b84a7..fd490f139e901c2ac598f1eab7aa8d50
public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
private static final float AVERAGE_PACKETS_SMOOTHING = 0.75F;
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
index ff80394fcae884f2a6a700de90c7b495862e532b..a9b9928f371581e6b324622aa9c75aac6d285d7c 100644
index 88a4ddf7dd3cfeef3c86406a053627d73b5db654..73e0119c4b6f81d08bdfe93751c904962701bfec 100644
--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
@@ -169,6 +169,7 @@ import net.minecraft.world.phys.shapes.Shapes;
@@ -150,7 +150,7 @@ index ff80394fcae884f2a6a700de90c7b495862e532b..a9b9928f371581e6b324622aa9c75aac
public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLevel, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevelReader, ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickServerLevel { // Paper - rewrite chunk system // Paper - chunk tick iteration
public static final BlockPos END_SPAWN_POINT = new BlockPos(100, 50, 0);
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index b3abfd93b7b4ce47e3382a9f81b82dbb2beb37ae..f0feadb8d4312d6569783c299968a50fe5c2edee 100644
index 491ebf1bf1729fc673a824866005cbd995fe4ac5..ded11128912f99b592285e72007f1379d1b5ea09 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -245,6 +245,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -161,7 +161,7 @@ index b3abfd93b7b4ce47e3382a9f81b82dbb2beb37ae..f0feadb8d4312d6569783c299968a50f
public class ServerGamePacketListenerImpl
extends ServerCommonPacketListenerImpl
@@ -803,7 +804,7 @@ public class ServerGamePacketListenerImpl
@@ -804,7 +805,7 @@ public class ServerGamePacketListenerImpl
// Paper start
final int index;
if (packet.getCommand().length() > 64 && ((index = packet.getCommand().indexOf(' ')) == -1 || index >= 64)) {

6
leaves-server/minecraft-patches/features/0100-Allow-grindstone-overstacking.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow grindstone overstacking
diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
index f5a6d01037235b120e13cde9134e5ac0fc2d2c00..2a470ea583b7f192e8dd07f25867dd51dc1ec3e7 100644
index 0fbedd33f036f5aecbe5e7ab3935785c0d645977..7da5f73a57749b498bcbff2d575c44bc4a0a1008 100644
--- a/net/minecraft/world/inventory/AbstractContainerMenu.java
+++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
@@ -746,10 +746,15 @@ public abstract class AbstractContainerMenu {
@@ -736,10 +736,15 @@ public abstract class AbstractContainerMenu {
public abstract boolean stillValid(Player player);
protected boolean moveItemStackTo(ItemStack stack, int startIndex, int endIndex, boolean reverseDirection) {
@@ -24,7 +24,7 @@ index f5a6d01037235b120e13cde9134e5ac0fc2d2c00..2a470ea583b7f192e8dd07f25867dd51
if (isCheck) {
stack = stack.copy();
}
@@ -814,6 +819,14 @@ public abstract class AbstractContainerMenu {
@@ -804,6 +809,14 @@ public abstract class AbstractContainerMenu {
// Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
if (itemx.isEmpty() && slotx.mayPlace(stack)) {
int i1 = slotx.getMaxStackSize(stack);

4
leaves-server/minecraft-patches/features/0118-Vanilla-player-display-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Vanilla player display name
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index eba1717566a8ea534bbf149e0593cc7656df2db9..311d4abc9cbd99e6b03135dadbd8ee93e7bc4a48 100644
index 2b8eb0f0aae8c6534b124012e26bf683929131a8..b3cb4970db16ab12f6588336168a453a47d284fb 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -449,7 +449,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -442,7 +442,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
// CraftBukkit start
this.displayName = this.getScoreboardName();

10
leaves-server/minecraft-patches/features/0119-Disable-packet-limit.patch
View File

@@ -20,10 +20,10 @@ index fd490f139e901c2ac598f1eab7aa8d50c65ef864..284cdbd6034ec8962409abba6da37eab
synchronized (PACKET_LIMIT_LOCK) {
if (this.allPacketCounts != null) {
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index a2c35011153daa3b171119b9c0b2e71a7f9a1788..a2be014d33d9ac6189fb7a79af674f2db0fe27cf 100644
index ded11128912f99b592285e72007f1379d1b5ea09..44ddadd2ca20809795399ab4d084a0c7c0148f58 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -791,7 +791,7 @@ public class ServerGamePacketListenerImpl
@@ -792,7 +792,7 @@ public class ServerGamePacketListenerImpl
public void handleCustomCommandSuggestions(ServerboundCommandSuggestionPacket packet) {
// PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - AsyncTabCompleteEvent; run this async
// CraftBukkit start
@@ -32,7 +32,7 @@ index a2c35011153daa3b171119b9c0b2e71a7f9a1788..a2be014d33d9ac6189fb7a79af674f2d
this.disconnectAsync(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - Kick event cause // Paper - add proper async disconnect
return;
}
@@ -1897,6 +1897,7 @@ public class ServerGamePacketListenerImpl
@@ -1898,6 +1898,7 @@ public class ServerGamePacketListenerImpl
private static int getSpamThreshold() { return io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.incomingPacketThreshold; } // Paper - Configurable threshold
private boolean checkLimit(long timestamp) {
@@ -40,7 +40,7 @@ index a2c35011153daa3b171119b9c0b2e71a7f9a1788..a2be014d33d9ac6189fb7a79af674f2d
if (this.lastLimitedPacket != -1 && timestamp - this.lastLimitedPacket < getSpamThreshold() && this.limitedPackets++ >= 8) { // Paper - Configurable threshold; raise packet limit to 8
return false;
}
@@ -2511,6 +2512,7 @@ public class ServerGamePacketListenerImpl
@@ -2512,6 +2513,7 @@ public class ServerGamePacketListenerImpl
// Spigot start - spam exclusions
private void detectRateSpam(String message) {
@@ -48,7 +48,7 @@ index a2c35011153daa3b171119b9c0b2e71a7f9a1788..a2be014d33d9ac6189fb7a79af674f2d
// CraftBukkit start - replaced with thread safe throttle
if (org.spigotmc.SpigotConfig.enableSpamExclusions) {
for (String exclude : org.spigotmc.SpigotConfig.spamExclusions) {
@@ -3298,7 +3300,7 @@ public class ServerGamePacketListenerImpl
@@ -3299,7 +3301,7 @@ public class ServerGamePacketListenerImpl
@Override
public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
// Paper start - auto recipe limit

6
leaves-server/minecraft-patches/features/0120-Fix-SculkCatalyst-exp-skip.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix SculkCatalyst exp skip
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index 311d4abc9cbd99e6b03135dadbd8ee93e7bc4a48..43fcd9c0fa419ed36c677003d75cfa84ea93baa2 100644
index b3cb4970db16ab12f6588336168a453a47d284fb..a0f86fa96560180585f3e0f01e4178727efda8df 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -1153,7 +1153,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -1146,7 +1146,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
}
// SPIGOT-5478 must be called manually now
@@ -17,7 +17,7 @@ index 311d4abc9cbd99e6b03135dadbd8ee93e7bc4a48..43fcd9c0fa419ed36c677003d75cfa84
// we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory.
if (!event.getKeepInventory()) {
// Paper start - PlayerDeathEvent#getItemsToKeep
@@ -1187,6 +1187,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -1180,6 +1180,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
this.setClientLoaded(false);
}

4
leaves-server/paper-patches/features/0003-Leaves-Server-Config-And-Command.patch
View File

@@ -37,10 +37,10 @@ index 1814cd072aaca3e72249f0509a9c3b3cb154eaba..11b394f479eb268b248fae8a72ea9788
} catch (CommandException ex) {
sender.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 59eddee7e75e1de332346ffe73fb88eb1ae14db6..faa2d73c8a9664110d954b833da0dca9ca21dbef 100644
index 1fb98caf0101fcbf3f045c0725c89fcbff4e7a7e..be8813cffb8bd5a5e573f9da63a6bd1a6f6d0bca 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1116,6 +1116,7 @@ public final class CraftServer implements Server {
@@ -1117,6 +1117,7 @@ public final class CraftServer implements Server {
playerMetadata.removeAll(plugin);
}
// Paper end

6
leaves-server/paper-patches/features/0004-Leaves-Protocol-Core.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Protocol Core
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c6fbb091c513fb9e5527ac9cb08af607f14468b4..16fdeed9bb0d088cd811c83c93517c0e51a7e9c3 100644
index be8813cffb8bd5a5e573f9da63a6bd1a6f6d0bca..bf7930e1f0581971293ce0dc4baae351223d78b8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -493,6 +493,7 @@ public final class CraftServer implements Server {
@@ -494,6 +494,7 @@ public final class CraftServer implements Server {
this.potionBrewer = new io.papermc.paper.potion.PaperPotionBrewer(console); // Paper - custom potion mixes
datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
this.spark = new io.papermc.paper.SparksFly(this); // Paper - spark
@@ -16,7 +16,7 @@ index c6fbb091c513fb9e5527ac9cb08af607f14468b4..16fdeed9bb0d088cd811c83c93517c0e
}
public boolean getCommandBlockOverride(String command) {
@@ -1123,6 +1124,7 @@ public final class CraftServer implements Server {
@@ -1124,6 +1125,7 @@ public final class CraftServer implements Server {
this.spark.registerCommandBeforePlugins(this); // Paper - spark
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");

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

@@ -34,10 +34,10 @@ index adc6741e0e017660fbd39a62b69be1e67e0e143f..9bc40b07b8eebded4f748fd053b45571
if (nmsEntity.level() != this.getHandle().getLevel()) {
nmsEntity = nmsEntity.teleport(new TeleportTransition(this.getHandle().getLevel(), nmsEntity, TeleportTransition.DO_NOTHING));
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c06b12e9d5535c8018c5b7f305946758dd9afd99..7e93baa65715383092fd43132b6f4da9eddcf39c 100644
index bf7930e1f0581971293ce0dc4baae351223d78b8..153c883645871a1283e6f1581523d409c2044b8f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -315,6 +315,7 @@ public final class CraftServer implements Server {
@@ -316,6 +316,7 @@ public final class CraftServer implements Server {
private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
private final io.papermc.paper.potion.PaperPotionBrewer potionBrewer; // Paper - Custom Potion Mixes
public final io.papermc.paper.SparksFly spark; // Paper - spark
@@ -45,7 +45,7 @@ index c06b12e9d5535c8018c5b7f305946758dd9afd99..7e93baa65715383092fd43132b6f4da9
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -494,6 +495,7 @@ public final class CraftServer implements Server {
@@ -495,6 +496,7 @@ public final class CraftServer implements Server {
datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
this.spark = new io.papermc.paper.SparksFly(this); // Paper - spark
org.leavesmc.leaves.protocol.core.LeavesProtocolManager.init(); // Leaves - protocol
@@ -53,7 +53,7 @@ index c06b12e9d5535c8018c5b7f305946758dd9afd99..7e93baa65715383092fd43132b6f4da9
}
public boolean getCommandBlockOverride(String command) {
@@ -1500,7 +1502,7 @@ public final class CraftServer implements Server {
@@ -1501,7 +1503,7 @@ public final class CraftServer implements Server {
return false;
}
@@ -62,7 +62,7 @@ index c06b12e9d5535c8018c5b7f305946758dd9afd99..7e93baa65715383092fd43132b6f4da9
return false;
}
@@ -3294,4 +3296,11 @@ public final class CraftServer implements Server {
@@ -3299,4 +3301,11 @@ public final class CraftServer implements Server {
this.console.addPluginAllowingSleep(plugin.getName(), value);
}
// Paper end - API to check if the server is sleeping
@@ -75,7 +75,7 @@ index c06b12e9d5535c8018c5b7f305946758dd9afd99..7e93baa65715383092fd43132b6f4da9
+ // Leaves end - Bot API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 1439d282167dc8a2e66f4896849153b810112988..f357e705290eda063ab659e05fea53fd8fe98a95 100644
index a92e0877669a92851c6d7f83de75ffb087c8e651..d39f59a0608a03dcad7fff307f08916b1ae19683 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -237,7 +237,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -140,7 +140,7 @@ index 1ee0ad266955e36b729ba31eb75aad9289acd8e4..2b441ba89c603903267db63c7515b0de
if (entity instanceof EnderDragonPart complexPart) {
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
index 57c3f8531bf85b53af3a4aad6e9e369d5cff0ce3..8d85c78b2769be4269e8342138448edac631ce9f 100644
index bbf44c44c6c3fc4cabad1453ab7aba9ac7ecb1e5..fa122a6a0c56cab95d366618845c3afd2654def7 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1025,7 +1025,11 @@ public class CraftEventFactory {

4
leaves-server/paper-patches/features/0009-Disable-packet-limit.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable packet limit
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 8b70a8e9b0aacbe7964b0441b5bbbaab228962d8..46318779cd0321d00a503d8be2b055efd69cab38 100644
index 12a7fec3ca4ceefd6c4e940bf60182bd2552d527..26ec5f97dbefdb076101a132b406bf3571a98b4d 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -287,7 +287,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -285,7 +285,7 @@ public class GlobalConfiguration extends ConfigurationPart {
}
public boolean isEnabled() {

12
leaves-server/paper-patches/features/0012-Replay-Mod-API.patch
View File

@@ -19,10 +19,10 @@ index a0a6cde96322df8e455b26b32b1c593f332d4db6..b5031ba5c48c7d007a7c05766a2beff4
}
// Leaves end - skip bot
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7e93baa65715383092fd43132b6f4da9eddcf39c..af648b9301a7a964af88a55e181b68780a9f4ca5 100644
index 153c883645871a1283e6f1581523d409c2044b8f..f1848949bc794f937818fdcdce4fadaab82bf849 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -316,6 +316,7 @@ public final class CraftServer implements Server {
@@ -317,6 +317,7 @@ public final class CraftServer implements Server {
private final io.papermc.paper.potion.PaperPotionBrewer potionBrewer; // Paper - Custom Potion Mixes
public final io.papermc.paper.SparksFly spark; // Paper - spark
private final org.leavesmc.leaves.entity.CraftBotManager botManager; // Leaves
@@ -30,7 +30,7 @@ index 7e93baa65715383092fd43132b6f4da9eddcf39c..af648b9301a7a964af88a55e181b6878
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -410,7 +411,7 @@ public final class CraftServer implements Server {
@@ -411,7 +412,7 @@ public final class CraftServer implements Server {
public CraftServer(DedicatedServer console, PlayerList playerList) {
this.console = console;
this.playerList = (DedicatedPlayerList) playerList;
@@ -39,7 +39,7 @@ index 7e93baa65715383092fd43132b6f4da9eddcf39c..af648b9301a7a964af88a55e181b6878
@Override
public CraftPlayer apply(ServerPlayer player) {
return player.getBukkitEntity();
@@ -3303,4 +3304,11 @@ public final class CraftServer implements Server {
@@ -3308,4 +3309,11 @@ public final class CraftServer implements Server {
return botManager;
}
// Leaves end - Bot API
@@ -64,10 +64,10 @@ index 2b441ba89c603903267db63c7515b0de2cbe09b1..81c8a0a236a892afd56b8fbc56427bb6
// 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 cc4b2061ae9cbd5a30b297be477cde703203b3f5..ed687326dfda04f006815f66c48e978221ce653c 100644
index 9f195c498a12de07e1581ab13ffe60e77f22a22c..7fbcff4370382ee5ea0b67baa683c2ff6618453a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2255,7 +2255,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2254,7 +2254,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public boolean canSee(Player player) {

14
leaves-server/paper-patches/features/0014-Bytebuf-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bytebuf API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index af648b9301a7a964af88a55e181b68780a9f4ca5..09a9c062a0ad15df3896fba161bdfb17d34181ba 100644
index f1848949bc794f937818fdcdce4fadaab82bf849..42ffcde28d14d7e6b0531dc70f6046f4ee211657 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -317,6 +317,7 @@ public final class CraftServer implements Server {
@@ -318,6 +318,7 @@ public final class CraftServer implements Server {
public final io.papermc.paper.SparksFly spark; // Paper - spark
private final org.leavesmc.leaves.entity.CraftBotManager botManager; // Leaves
private final org.leavesmc.leaves.entity.CraftPhotographerManager photographerManager = new org.leavesmc.leaves.entity.CraftPhotographerManager(); // Leaves
@@ -16,7 +16,7 @@ index af648b9301a7a964af88a55e181b68780a9f4ca5..09a9c062a0ad15df3896fba161bdfb17
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -3311,4 +3312,15 @@ public final class CraftServer implements Server {
@@ -3316,4 +3317,15 @@ public final class CraftServer implements Server {
return photographerManager;
}
// Leaves end - replay mod api
@@ -33,12 +33,12 @@ index af648b9301a7a964af88a55e181b68780a9f4ca5..09a9c062a0ad15df3896fba161bdfb17
+ // Leaves end - Bytebuf API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ed687326dfda04f006815f66c48e978221ce653c..f6fb0b7e7ee67c5a1dfe1ff113c774f402af3d32 100644
index 7fbcff4370382ee5ea0b67baa683c2ff6618453a..aee743ffb255f0aec1a62cb55980ec8b3eda5ed7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3619,4 +3619,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSimplifyContainerDesyncCheck(final boolean simplifyContainerDesyncCheck) {
this.simplifyContainerDesyncCheck = simplifyContainerDesyncCheck;
@@ -3602,4 +3602,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setDeathScreenScore(final int score) {
getHandle().setScore(score);
}
+
+ // Leaves start - Bytebuf API

2
scripts/GetReleaseInfo.sh
View File

@@ -53,7 +53,7 @@ mv leaves-server/build/libs/leaves-leavesclip-"$gradleVersion"-mojmap.jar "$jarN
echo "### Commit Message"
} >> $releaseinfo
number=$(git log --oneline master ^"$(git describe --tags --abbrev=0)" | wc -l)
number=$(git log --oneline HEAD ^"$(git describe --tags --abbrev=0)" | wc -l)
git log --pretty='> [%h] %s' "-$number" >> $releaseinfo
{

2
scripts/PushToAPI.sh
View File

@@ -23,4 +23,4 @@ changes=$(git log --pretty='%H<<<%s>>>' -"$number" | sed ':a;N;$!ba;s/\n//g')
jar_name="leaves-$mcversion.jar"
jar_sha256=`sha256 $jar_name`
curl --location --request POST "https://api.leavesmc.org/v2/commit/build" --header "Content-Type: application/json" --header "Authentication: Bearer $secret_v2" --data-raw "{\"project_id\":\"$project_id\",\"version\":\"$mcversion\",\"channel\":\"$channel\",\"changes\":\"$changes\",\"jar_name\":\"$jar_name\",\"sha256\":\"$jar_sha256\",\"tag\":\"$tag\"}"
curl --location --request POST "https://api.leavesmc.org/v2/commit/build" --header "Content-Type: application/json" --header "Authorization: Bearer $secret_v2" --data-raw "{\"project_id\":\"$project_id\",\"version\":\"$mcversion\",\"channel\":\"$channel\",\"changes\":\"$changes\",\"jar_name\":\"$jar_name\",\"sha256\":\"$jar_sha256\",\"tag\":\"$tag\"}"