From 7ac4a1bd0acc9847c736e616c71c60975eb411e0 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Mon, 14 Apr 2025 11:14:09 -0400 Subject: [PATCH] Fix build --- .../0100-Fix-Pufferfish-and-Purpur-patches.patch | 15 ++++++++++++++- .../leaf/async/path/NodeEvaluatorCache.java | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/leaf-server/minecraft-patches/features/0100-Fix-Pufferfish-and-Purpur-patches.patch b/leaf-server/minecraft-patches/features/0100-Fix-Pufferfish-and-Purpur-patches.patch index 55ece446..df6f9ae1 100644 --- a/leaf-server/minecraft-patches/features/0100-Fix-Pufferfish-and-Purpur-patches.patch +++ b/leaf-server/minecraft-patches/features/0100-Fix-Pufferfish-and-Purpur-patches.patch @@ -128,7 +128,7 @@ index 1539e039d4d5fd539cfc552a4d420ae5a6fb8b56..109ec179bd7e960cb09a98e1ec6179a6 public Entity(EntityType entityType, Level level) { this.type = entityType; diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index dfca015796b87059b19db55b4911bd0de2580798..40ab67a6930242553ed7acc9d6cc474a36e23888 100644 +index eb17ef1e0c350e97149452dbdc79398d71370fb1..d265278a56575529198735c113fa72c53b541669 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -1024,13 +1024,13 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -305,3 +305,16 @@ index bde9370798c037c494a9c73f328cb251e68c21b1..3a6be0122d49b20f78be6cc8f1c7acb5 } else if (maxProjectileChunkLoadsConfig.perProjectile.resetMovementAfterReachLimit) { this.setDeltaMovement(0, this.getDeltaMovement().y, 0); } +diff --git a/org/purpurmc/purpur/PurpurWorldConfig.java b/org/purpurmc/purpur/PurpurWorldConfig.java +index ed5bbc49da258f8db249b1387f51ed1b22a29053..98f7fd9a9c9eec89c510c313bd2ac5bed918707e 100644 +--- a/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/org/purpurmc/purpur/PurpurWorldConfig.java +@@ -17,7 +17,7 @@ import net.minecraft.world.item.Items; + import net.minecraft.world.level.block.Block; + import net.minecraft.world.level.block.Blocks; + import net.minecraft.world.level.block.state.properties.Tilt; +-import org.apache.commons.lang.BooleanUtils; ++import org.apache.commons.lang3.BooleanUtils; // Leaf - Fix build + import org.bukkit.ChatColor; + import org.bukkit.World; + import org.bukkit.configuration.ConfigurationSection; diff --git a/leaf-server/src/main/java/org/dreeam/leaf/async/path/NodeEvaluatorCache.java b/leaf-server/src/main/java/org/dreeam/leaf/async/path/NodeEvaluatorCache.java index c2397543..b95c8fc5 100644 --- a/leaf-server/src/main/java/org/dreeam/leaf/async/path/NodeEvaluatorCache.java +++ b/leaf-server/src/main/java/org/dreeam/leaf/async/path/NodeEvaluatorCache.java @@ -3,7 +3,7 @@ package org.dreeam.leaf.async.path; import ca.spottedleaf.concurrentutil.collection.MultiThreadedQueue; import net.minecraft.world.level.pathfinder.NodeEvaluator; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.jetbrains.annotations.NotNull; import java.util.Map;