diff --git a/divinemc-server/minecraft-patches/features/0049-Clump-experience-orbs.patch b/divinemc-server/minecraft-patches/features/0049-Clump-experience-orbs.patch index 96de872..9a4c5dc 100644 --- a/divinemc-server/minecraft-patches/features/0049-Clump-experience-orbs.patch +++ b/divinemc-server/minecraft-patches/features/0049-Clump-experience-orbs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Clump experience orbs diff --git a/net/minecraft/world/entity/ExperienceOrb.java b/net/minecraft/world/entity/ExperienceOrb.java -index c8354d46ed909090f7c15f396863bf7d73afcefa..96d22f93fc07de0fecf3249081a997c280b8fde2 100644 +index 66ae0b340c7e9ebccfeaee786577e27916ace38c..c3144a0e2a839c0d8ae2d1c450213fa6a56a58c4 100644 --- a/net/minecraft/world/entity/ExperienceOrb.java +++ b/net/minecraft/world/entity/ExperienceOrb.java @@ -50,6 +50,10 @@ public class ExperienceOrb extends Entity { @@ -147,7 +147,7 @@ index c8354d46ed909090f7c15f396863bf7d73afcefa..96d22f93fc07de0fecf3249081a997c2 + // Canvas end if (entity instanceof ServerPlayer serverPlayer) { if (entity.takeXpDelay == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(serverPlayer.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper - PlayerPickupExperienceEvent - entity.takeXpDelay = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerXpCooldownEvent(entity, this.level().purpurConfig.playerExpPickupDelay, org.bukkit.event.player.PlayerExpCooldownChangeEvent.ChangeReason.PICKUP_ORB).getNewCooldown(); // CraftBukkit - entityhuman.takeXpDelay = 2; // Purpur - Configurable player pickup exp delay + entity.takeXpDelay = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerXpCooldownEvent(entity, this.level().purpurConfig.playerExpPickupDelay, org.bukkit.event.player.PlayerExpCooldownChangeEvent.ChangeReason.PICKUP_ORB).getNewCooldown(); // CraftBukkit - entity.takeXpDelay = 2; // Purpur - Configurable player pickup exp delay @@ -373,10 +460,60 @@ public class ExperienceOrb extends Entity { } } diff --git a/divinemc-server/paper-patches/features/0005-Paper-PR-Add-FillBottleEvents-for-player-and-dispens.patch b/divinemc-server/paper-patches/features/0005-Paper-PR-Add-FillBottleEvents-for-player-and-dispens.patch index 461c24f..2b1f569 100644 --- a/divinemc-server/paper-patches/features/0005-Paper-PR-Add-FillBottleEvents-for-player-and-dispens.patch +++ b/divinemc-server/paper-patches/features/0005-Paper-PR-Add-FillBottleEvents-for-player-and-dispens.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Paper PR: Add FillBottleEvents for player and dispenser diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index a162440a583801671787163d998d6b9546ef7e61..d10ee84ed2f6b1c81667b968984f3ebf5c39e445 100644 +index b4ee0f809c1524c74eca74ee6bc471a3051d92a6..7725870545b4c87dc5e7536d04c710999ea6932b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -2128,4 +2128,18 @@ public class CraftEventFactory { +@@ -2125,4 +2125,18 @@ public class CraftEventFactory { return disconnectReason; } diff --git a/divinemc-server/paper-patches/features/0014-Petal-Multithreaded-Tracker.patch b/divinemc-server/paper-patches/features/0014-Petal-Multithreaded-Tracker.patch index 58694ba..acacd42 100644 --- a/divinemc-server/paper-patches/features/0014-Petal-Multithreaded-Tracker.patch +++ b/divinemc-server/paper-patches/features/0014-Petal-Multithreaded-Tracker.patch @@ -45,10 +45,10 @@ index 8d967f179e7b36517ecc6f29381bf69e57eb7a85..8e376ae6d3a8cadd3e7ac15f8d2c5666 break; } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 67d25c18b1d13da3294572ea4ec17f2d18cba43c..820746afec2d007cc895edcf637622ef4c0d058c 100644 +index 7725870545b4c87dc5e7536d04c710999ea6932b..afbcad33bd8feb5246f320fafff5c4a2c2e366e4 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1808,6 +1808,26 @@ public class CraftEventFactory { +@@ -1805,6 +1805,26 @@ public class CraftEventFactory { } public static boolean handleBlockFormEvent(Level world, BlockPos pos, net.minecraft.world.level.block.state.BlockState state, int flags, @Nullable Entity entity, boolean checkSetResult) { diff --git a/gradle.properties b/gradle.properties index fa634d4..18d0426 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.bxteam.divinemc version=1.21.8-R0.1-SNAPSHOT mcVersion=1.21.8 -purpurRef=db12e9b1f5b9d641c8299eba7ef8a2f328b30793 +purpurRef=59fb18d3c0401390c8b2953bdf1733c27db3f4d3 experimental=false org.gradle.configuration-cache=true