Configurable player pickup exp delay

Default vanilla value is to delay 2 ticks between picking up exp orbs. Players only pick up 1 orb at a time, so even with setting this to 0 players still only pick up one orb every tick. However, setting this to any negative number will pick up all orbs instantly.

patches/server/0225-Configurable-player-pickup-exp-delay.patch

@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@Gmail.com>
-Date: Mon, 10 Jan 2022 10:04:31 -0600
-Subject: [PATCH] Configurable player pickup exp delay
-
-Default vanilla value is to delay 2 ticks between picking up exp orbs.
-Players only pick up 1 orb at a time, so even with setting this to 0
-players still only pick up one orb every tick. However, setting this
-to any negative number will pick up all orbs instantly.
-
-diff --git a/net/minecraft/world/entity/ExperienceOrb.java b/net/minecraft/world/entity/ExperienceOrb.java
-index f1eb74a43881400f23f3750c909f999b35c2f5ce..ba4fe614e2a3378f17b544c78c92a271523e8d37 100644
---- a/net/minecraft/world/entity/ExperienceOrb.java
-+++ b/net/minecraft/world/entity/ExperienceOrb.java
-@@ -335,7 +335,7 @@ public class ExperienceOrb extends Entity {
-     public void playerTouch(Player player) {
-         if (player instanceof ServerPlayer entityplayer) {
-             if (player.takeXpDelay == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(entityplayer.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper - PlayerPickupExperienceEvent
--                player.takeXpDelay = CraftEventFactory.callPlayerXpCooldownEvent(player, 2, PlayerExpCooldownChangeEvent.ChangeReason.PICKUP_ORB).getNewCooldown(); // CraftBukkit - entityhuman.takeXpDelay = 2;
-+                player.takeXpDelay = CraftEventFactory.callPlayerXpCooldownEvent(player, this.level().purpurConfig.playerExpPickupDelay, PlayerExpCooldownChangeEvent.ChangeReason.PICKUP_ORB).getNewCooldown(); // CraftBukkit - entityhuman.takeXpDelay = 2; // Purpur
-                 player.take(this, 1);
-                 int i = this.repairPlayerItems(entityplayer, this.value);
- 
-diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index dda9391962b7360714cc1491e6cabfc2616dab25..7893d257deef3c1bb0187c6a0b04659716b520f9 100644
---- a/net/minecraft/world/entity/player/Player.java
-+++ b/net/minecraft/world/entity/player/Player.java
-@@ -665,7 +665,7 @@ public abstract class Player extends LivingEntity {
-             while (iterator.hasNext()) {
-                 Entity entity = (Entity) iterator.next();
- 
--                if (entity.getType() == EntityType.EXPERIENCE_ORB) {
-+                if (entity.getType() == EntityType.EXPERIENCE_ORB && entity.level().purpurConfig.playerExpPickupDelay >= 0) { // Purpur
-                     list1.add(entity);
-                 } else if (!entity.isRemoved()) {
-                     this.touch(entity);
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c5e894560b3ac371da123a339355fa89dd442ee4..724dd962259b10649e12bf26b81fc87d315def8c 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -423,6 +423,7 @@ public class PurpurWorldConfig {
-     public boolean playerRidableInWater = false;
-     public boolean playerRemoveBindingWithWeakness = false;
-     public int shiftRightClickRepairsMendingPoints = 0;
-+    public int playerExpPickupDelay = 2;
-     private void playerSettings() {
-         if (PurpurConfig.version < 19) {
-             boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
-@@ -448,6 +449,7 @@ public class PurpurWorldConfig {
-         playerRidableInWater = getBoolean("gameplay-mechanics.player.ridable-in-water", playerRidableInWater);
-         playerRemoveBindingWithWeakness = getBoolean("gameplay-mechanics.player.curse-of-binding.remove-with-weakness", playerRemoveBindingWithWeakness);
-         shiftRightClickRepairsMendingPoints = getInt("gameplay-mechanics.player.shift-right-click-repairs-mending-points", shiftRightClickRepairsMendingPoints);
-+        playerExpPickupDelay = getInt("gameplay-mechanics.player.exp-pickup-delay-ticks", playerExpPickupDelay);
-     }
- 
-     public boolean silkTouchEnabled = false;

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ExperienceOrb.java.patch

@@ -1,5 +1,14 @@
 --- a/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/net/minecraft/world/entity/ExperienceOrb.java
+@@ -323,7 +_,7 @@
+     public void playerTouch(Player entity) {
+         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 = CraftEventFactory.callPlayerXpCooldownEvent(entity, 2, PlayerExpCooldownChangeEvent.ChangeReason.PICKUP_ORB).getNewCooldown(); // CraftBukkit - entityhuman.takeXpDelay = 2;
++                entity.takeXpDelay = CraftEventFactory.callPlayerXpCooldownEvent(entity, this.level().purpurConfig.playerExpPickupDelay, PlayerExpCooldownChangeEvent.ChangeReason.PICKUP_ORB).getNewCooldown(); // CraftBukkit - entityhuman.takeXpDelay = 2; // Purpur - Configurable player pickup exp delay
+                 entity.take(this, 1);
+                 int i = this.repairPlayerItems(serverPlayer, this.value);
+                 if (i > 0) {
 @@ -339,7 +_,7 @@
      }
  

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch

@@ -52,6 +52,15 @@
          this.cooldowns.tick();
          this.updatePlayerPose();
          if (this.currentImpulseContextResetGraceTime > 0) {
+@@ -610,7 +_,7 @@
+             List<Entity> list = Lists.newArrayList();
+ 
+             for (Entity entity : entities) {
+-                if (entity.getType() == EntityType.EXPERIENCE_ORB) {
++                if (entity.getType() == EntityType.EXPERIENCE_ORB && entity.level().purpurConfig.playerExpPickupDelay >= 0) { // Purpur - Configurable player pickup exp delay
+                     list.add(entity);
+                 } else if (!entity.isRemoved()) {
+                     this.touch(entity);
 @@ -1264,7 +_,7 @@
                          flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper - Toggleable player crits
                          if (flag2) {

purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java

@@ -422,6 +422,7 @@ public class PurpurWorldConfig {
     public boolean playerRidableInWater = false;
     public boolean playerRemoveBindingWithWeakness = false;
     public int shiftRightClickRepairsMendingPoints = 0;
+    public int playerExpPickupDelay = 2;
     private void playerSettings() {
         if (PurpurConfig.version < 19) {
             boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -447,6 +448,7 @@ public class PurpurWorldConfig {
         playerRidableInWater = getBoolean("gameplay-mechanics.player.ridable-in-water", playerRidableInWater);
         playerRemoveBindingWithWeakness = getBoolean("gameplay-mechanics.player.curse-of-binding.remove-with-weakness", playerRemoveBindingWithWeakness);
         shiftRightClickRepairsMendingPoints = getInt("gameplay-mechanics.player.shift-right-click-repairs-mending-points", shiftRightClickRepairsMendingPoints);
+        playerExpPickupDelay = getInt("gameplay-mechanics.player.exp-pickup-delay-ticks", playerExpPickupDelay);
     }
 
     public boolean silkTouchEnabled = false;