Next one unfortunately is LivingEntity

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

@@ -1,9 +1,9 @@
 --- a/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/net/minecraft/world/entity/ExperienceOrb.java
-@@ -24,6 +24,13 @@
+@@ -24,6 +_,14 @@
- import net.minecraft.world.level.entity.EntityTypeTest;
  import net.minecraft.world.phys.AABB;
  import net.minecraft.world.phys.Vec3;
+ 
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.event.CraftEventFactory;
 +import org.bukkit.event.entity.EntityRemoveEvent;
@@ -11,20 +11,22 @@
 +import org.bukkit.event.entity.EntityTargetEvent;
 +import org.bukkit.event.player.PlayerExpCooldownChangeEvent;
 +// CraftBukkit end
- 
++
  public class ExperienceOrb extends Entity {
- 
+     private static final int LIFETIME = 6000;
-@@ -37,9 +44,63 @@
+     private static final int ENTITY_SCAN_PERIOD = 20;
+@@ -35,9 +_,63 @@
      public int value;
-     public int count;
+     public int count = 1;
      private Player followingPlayer;
+-
 +    // Paper start
 +    @javax.annotation.Nullable
 +    public java.util.UUID sourceEntityId;
 +    @javax.annotation.Nullable
 +    public java.util.UUID triggerEntityId;
 +    public org.bukkit.entity.ExperienceOrb.SpawnReason spawnReason = org.bukkit.entity.ExperienceOrb.SpawnReason.UNKNOWN;
- 
++
 +    private void loadPaperNBT(CompoundTag tag) {
 +        if (!tag.contains("Paper.ExpData", net.minecraft.nbt.Tag.TAG_COMPOUND)) {
 +            return;
@@ -61,24 +63,24 @@
 +
 +    @io.papermc.paper.annotation.DoNotUse
 +    @Deprecated
-     public ExperienceOrb(Level world, double x, double y, double z, int amount) {
+     public ExperienceOrb(Level level, double x, double y, double z, int value) {
-+        this(world, x, y, z, amount, null, null);
++        this(level, x, y, z, value, null, null);
 +    }
 +
-+    public ExperienceOrb(Level world, double x, double y, double z, int amount, @javax.annotation.Nullable org.bukkit.entity.ExperienceOrb.SpawnReason reason, @javax.annotation.Nullable Entity triggerId) {
++    public ExperienceOrb(Level level, double x, double y, double z, int value, @javax.annotation.Nullable org.bukkit.entity.ExperienceOrb.SpawnReason reason, @javax.annotation.Nullable Entity triggerId) {
-+        this(world, x, y, z, amount, reason, triggerId, null);
++        this(level, x, y, z, value, reason, triggerId, null);
 +    }
 +
-+    public ExperienceOrb(Level world, double x, double y, double z, int amount, @javax.annotation.Nullable org.bukkit.entity.ExperienceOrb.SpawnReason reason, @javax.annotation.Nullable Entity triggerId, @javax.annotation.Nullable Entity sourceId) {
++    public ExperienceOrb(Level level, double x, double y, double z, int value, @javax.annotation.Nullable org.bukkit.entity.ExperienceOrb.SpawnReason reason, @javax.annotation.Nullable Entity triggerId, @javax.annotation.Nullable Entity sourceId) {
-         this(EntityType.EXPERIENCE_ORB, world);
+         this(EntityType.EXPERIENCE_ORB, level);
 +        this.sourceEntityId = sourceId != null ? sourceId.getUUID() : null;
 +        this.triggerEntityId = triggerId != null ? triggerId.getUUID() : null;
 +        this.spawnReason = reason != null ? reason : org.bukkit.entity.ExperienceOrb.SpawnReason.UNKNOWN;
 +        // Paper end
          this.setPos(x, y, z);
-         this.setYRot((float) (this.random.nextDouble() * 360.0D));
+         this.setYRot((float)(this.random.nextDouble() * 360.0));
-         this.setDeltaMovement((this.random.nextDouble() * 0.20000000298023224D - 0.10000000149011612D) * 2.0D, this.random.nextDouble() * 0.2D * 2.0D, (this.random.nextDouble() * 0.20000000298023224D - 0.10000000149011612D) * 2.0D);
+         this.setDeltaMovement(
-@@ -68,6 +129,7 @@
+@@ -67,6 +_,7 @@
      @Override
      public void tick() {
          super.tick();
@@ -86,7 +88,7 @@
          this.xo = this.getX();
          this.yo = this.getY();
          this.zo = this.getZ();
-@@ -93,7 +155,22 @@
+@@ -92,7 +_,22 @@
              this.followingPlayer = null;
          }
  
@@ -107,161 +109,156 @@
 +
 +        if (this.followingPlayer != null && !cancelled) {
 +            // CraftBukkit end
-             Vec3 vec3d = new Vec3(this.followingPlayer.getX() - this.getX(), this.followingPlayer.getY() + (double) this.followingPlayer.getEyeHeight() / 2.0D - this.getY(), this.followingPlayer.getZ() - this.getZ());
+             Vec3 vec3 = new Vec3(
-             double d0 = vec3d.lengthSqr();
+                 this.followingPlayer.getX() - this.getX(),
+                 this.followingPlayer.getY() + this.followingPlayer.getEyeHeight() / 2.0 - this.getY(),
+@@ -120,7 +_,7 @@
  
-@@ -121,7 +198,7 @@
+         this.age++;
- 
-         ++this.age;
          if (this.age >= 6000) {
 -            this.discard();
 +            this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
          }
- 
-     }
-@@ -150,18 +227,27 @@
      }
  
-     public static void award(ServerLevel world, Vec3 pos, int amount) {
+@@ -143,16 +_,25 @@
+     }
+ 
+     public static void award(ServerLevel level, Vec3 pos, int amount) {
 +        // Paper start - add reasons for orbs
-+        award(world, pos, amount, null, null, null);
++        award(level, pos, amount, null, null, null);
 +    }
-+    public static void award(ServerLevel world, Vec3 pos, int amount, org.bukkit.entity.ExperienceOrb.SpawnReason reason, Entity triggerId) {
++    public static void award(ServerLevel level, Vec3 pos, int amount, org.bukkit.entity.ExperienceOrb.SpawnReason reason, Entity triggerId) {
-+        award(world, pos, amount, reason, triggerId, null);
++        award(level, pos, amount, reason, triggerId, null);
 +    }
-+    public static void award(ServerLevel world, Vec3 pos, int amount, org.bukkit.entity.ExperienceOrb.SpawnReason reason, Entity triggerId, Entity sourceId) {
++    public static void award(ServerLevel level, Vec3 pos, int amount, org.bukkit.entity.ExperienceOrb.SpawnReason reason, Entity triggerId, Entity sourceId) {
 +        // Paper end - add reasons for orbs
          while (amount > 0) {
-             int j = ExperienceOrb.getExperienceValue(amount);
+             int experienceValue = getExperienceValue(amount);
- 
+             amount -= experienceValue;
-             amount -= j;
+             if (!tryMergeToExisting(level, pos, experienceValue)) {
-             if (!ExperienceOrb.tryMergeToExisting(world, pos, j)) {
+-                level.addFreshEntity(new ExperienceOrb(level, pos.x(), pos.y(), pos.z(), experienceValue));
--                world.addFreshEntity(new ExperienceOrb(world, pos.x(), pos.y(), pos.z(), j));
++                level.addFreshEntity(new ExperienceOrb(level, pos.x(), pos.y(), pos.z(), experienceValue, reason, triggerId, sourceId)); // Paper - add reason
-+                world.addFreshEntity(new ExperienceOrb(world, pos.x(), pos.y(), pos.z(), j, reason, triggerId, sourceId)); // Paper - add reason
              }
          }
- 
      }
  
-     private static boolean tryMergeToExisting(ServerLevel world, Vec3 pos, int amount) {
+     private static boolean tryMergeToExisting(ServerLevel level, Vec3 pos, int amount) {
 +        // Paper - TODO some other event for this kind of merge
-         AABB axisalignedbb = AABB.ofSize(pos, 1.0D, 1.0D, 1.0D);
+         AABB aabb = AABB.ofSize(pos, 1.0, 1.0, 1.0);
-         int j = world.getRandom().nextInt(40);
+         int randomInt = level.getRandom().nextInt(40);
-         List<ExperienceOrb> list = world.getEntities(EntityTypeTest.forClass(ExperienceOrb.class), axisalignedbb, (entityexperienceorb) -> {
+         List<ExperienceOrb> entities = level.getEntities(EntityTypeTest.forClass(ExperienceOrb.class), aabb, orb -> canMerge(orb, randomInt, amount));
-@@ -188,9 +274,14 @@
+@@ -175,9 +_,14 @@
      }
  
-     private void merge(ExperienceOrb other) {
+     private void merge(ExperienceOrb orb) {
 +        // Paper start - call orb merge event
-+        if (!new com.destroystokyo.paper.event.entity.ExperienceOrbMergeEvent((org.bukkit.entity.ExperienceOrb) this.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) other.getBukkitEntity()).callEvent()) {
++        if (!new com.destroystokyo.paper.event.entity.ExperienceOrbMergeEvent((org.bukkit.entity.ExperienceOrb) this.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) orb.getBukkitEntity()).callEvent()) {
 +            return;
 +        }
 +        // Paper end - call orb merge event
-         this.count += other.count;
+         this.count = this.count + orb.count;
-         this.age = Math.min(this.age, other.age);
+         this.age = Math.min(this.age, orb.age);
--        other.discard();
+-        orb.discard();
-+        other.discard(EntityRemoveEvent.Cause.MERGE); // CraftBukkit - add Bukkit remove cause
++        orb.discard(EntityRemoveEvent.Cause.MERGE); // CraftBukkit - add Bukkit remove cause
      }
  
      private void setUnderwaterMovement() {
-@@ -215,7 +306,7 @@
+@@ -202,7 +_,7 @@
              this.markHurt();
-             this.health = (int) ((float) this.health - amount);
+             this.health = (int)(this.health - amount);
              if (this.health <= 0) {
 -                this.discard();
 +                this.discard(EntityRemoveEvent.Cause.DEATH); // CraftBukkit - add Bukkit remove cause
              }
  
              return true;
-@@ -226,33 +317,35 @@
+@@ -213,32 +_,34 @@
-     public void addAdditionalSaveData(CompoundTag nbt) {
+     public void addAdditionalSaveData(CompoundTag compound) {
-         nbt.putShort("Health", (short) this.health);
+         compound.putShort("Health", (short)this.health);
-         nbt.putShort("Age", (short) this.age);
+         compound.putShort("Age", (short)this.age);
--        nbt.putShort("Value", (short) this.value);
+-        compound.putShort("Value", (short)this.value);
-+        nbt.putInt("Value", this.value); // Paper - save as Integer
++        compound.putInt("Value", this.value); // Paper - save as Integer
-         nbt.putInt("Count", this.count);
+         compound.putInt("Count", this.count);
-+        this.savePaperNBT(nbt); // Paper
++        this.savePaperNBT(compound); // Paper
      }
  
      @Override
-     public void readAdditionalSaveData(CompoundTag nbt) {
+     public void readAdditionalSaveData(CompoundTag compound) {
-         this.health = nbt.getShort("Health");
+         this.health = compound.getShort("Health");
-         this.age = nbt.getShort("Age");
+         this.age = compound.getShort("Age");
--        this.value = nbt.getShort("Value");
+-        this.value = compound.getShort("Value");
-+        this.value = nbt.getInt("Value"); // Paper - load as Integer
++        this.value = compound.getInt("Value"); // Paper - load as Integer
-         this.count = Math.max(nbt.getInt("Count"), 1);
+         this.count = Math.max(compound.getInt("Count"), 1);
-+        this.loadPaperNBT(nbt); // Paper
++        this.loadPaperNBT(compound); // Paper
      }
  
      @Override
-     public void playerTouch(Player player) {
+     public void playerTouch(Player entity) {
-         if (player instanceof ServerPlayer entityplayer) {
+         if (entity instanceof ServerPlayer serverPlayer) {
--            if (player.takeXpDelay == 0) {
+-            if (entity.takeXpDelay == 0) {
--                player.takeXpDelay = 2;
+-                entity.takeXpDelay = 2;
-+            if (player.takeXpDelay == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(entityplayer.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper - PlayerPickupExperienceEvent
++            if (entity.takeXpDelay == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(serverPlayer.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;
++                entity.takeXpDelay = CraftEventFactory.callPlayerXpCooldownEvent(entity, 2, PlayerExpCooldownChangeEvent.ChangeReason.PICKUP_ORB).getNewCooldown(); // CraftBukkit - entityhuman.takeXpDelay = 2;
-                 player.take(this, 1);
+                 entity.take(this, 1);
-                 int i = this.repairPlayerItems(entityplayer, this.value);
+                 int i = this.repairPlayerItems(serverPlayer, this.value);
- 
                  if (i > 0) {
--                    player.giveExperiencePoints(i);
+-                    entity.giveExperiencePoints(i);
-+                    player.giveExperiencePoints(CraftEventFactory.callPlayerExpChangeEvent(player, this).getAmount()); // CraftBukkit - this.value -> event.getAmount() // Paper - supply experience orb object
++                    entity.giveExperiencePoints(CraftEventFactory.callPlayerExpChangeEvent(entity, this).getAmount()); // CraftBukkit - this.value -> event.getAmount() // Paper - supply experience orb object
                  }
  
-                 --this.count;
+                 this.count--;
                  if (this.count == 0) {
 -                    this.discard();
 +                    this.discard(EntityRemoveEvent.Cause.PICKUP); // CraftBukkit - add Bukkit remove cause
                  }
              }
- 
+         }
-@@ -266,12 +359,23 @@
+@@ -252,10 +_,21 @@
-             ItemStack itemstack = ((EnchantedItemInUse) optional.get()).itemStack();
+             ItemStack itemStack = randomItemWith.get().itemStack();
-             int j = EnchantmentHelper.modifyDurabilityToRepairFromXp(player.serverLevel(), itemstack, amount);
+             int i = EnchantmentHelper.modifyDurabilityToRepairFromXp(player.serverLevel(), itemStack, value);
-             int k = Math.min(j, itemstack.getDamageValue());
+             int min = Math.min(i, itemStack.getDamageValue());
 +            // CraftBukkit start
 +            // Paper start - mending event
-+            final int consumedExperience = k > 0 ? k * amount / j : 0;
++            final int consumedExperience = min > 0 ? min * value / i : 0;
-+            org.bukkit.event.player.PlayerItemMendEvent event = CraftEventFactory.callPlayerItemMendEvent(player, this, itemstack, optional.get().inSlot(), k, consumedExperience);
++            org.bukkit.event.player.PlayerItemMendEvent event = CraftEventFactory.callPlayerItemMendEvent(player, this, itemStack, randomItemWith.get().inSlot(), min, consumedExperience);
 +            // Paper end - mending event
-+            k = event.getRepairAmount();
++            min = event.getRepairAmount();
 +            if (event.isCancelled()) {
-+                return amount;
++                return value;
 +            }
 +            // CraftBukkit end
- 
+             itemStack.setDamageValue(itemStack.getDamageValue() - min);
-             itemstack.setDamageValue(itemstack.getDamageValue() - k);
+             if (min > 0) {
-             if (k > 0) {
+-                int i1 = value - min * value / i;
--                int l = amount - k * amount / j;
++                int i1 = value - min * value / i; // Paper - diff on change - expand PlayerMendEvents
-+                int l = amount - k * amount / j; // Paper - diff on change - expand PlayerMendEvents
+                 if (i1 > 0) {
- 
-                 if (l > 0) {
 +                    // this.value = l; // CraftBukkit - update exp value of orb for PlayerItemMendEvent calls // Paper - the value field should not be mutated here because it doesn't take "count" into account
-                     return this.repairPlayerItems(player, l);
+                     return this.repairPlayerItems(player, i1);
                  }
              }
-@@ -291,6 +395,24 @@
+@@ -295,6 +_,24 @@
      }
  
-     public static int getExperienceValue(int value) {
+     public static int getExperienceValue(int expValue) {
 +        // CraftBukkit start
-+        if (value > 162670129) return value - 100000;
++        if (expValue > 162670129) return expValue - 100000;
-+        if (value > 81335063) return 81335063;
++        if (expValue > 81335063) return 81335063;
-+        if (value > 40667527) return 40667527;
++        if (expValue > 40667527) return 40667527;
-+        if (value > 20333759) return 20333759;
++        if (expValue > 20333759) return 20333759;
-+        if (value > 10166857) return 10166857;
++        if (expValue > 10166857) return 10166857;
-+        if (value > 5083423) return 5083423;
++        if (expValue > 5083423) return 5083423;
-+        if (value > 2541701) return 2541701;
++        if (expValue > 2541701) return 2541701;
-+        if (value > 1270849) return 1270849;
++        if (expValue > 1270849) return 1270849;
-+        if (value > 635413) return 635413;
++        if (expValue > 635413) return 635413;
-+        if (value > 317701) return 317701;
++        if (expValue > 317701) return 317701;
-+        if (value > 158849) return 158849;
++        if (expValue > 158849) return 158849;
-+        if (value > 79423) return 79423;
++        if (expValue > 79423) return 79423;
-+        if (value > 39709) return 39709;
++        if (expValue > 39709) return 39709;
-+        if (value > 19853) return 19853;
++        if (expValue > 19853) return 19853;
-+        if (value > 9923) return 9923;
++        if (expValue > 9923) return 9923;
-+        if (value > 4957) return 4957;
++        if (expValue > 4957) return 4957;
 +        // CraftBukkit end
-         return value >= 2477 ? 2477 : (value >= 1237 ? 1237 : (value >= 617 ? 617 : (value >= 307 ? 307 : (value >= 149 ? 149 : (value >= 73 ? 73 : (value >= 37 ? 37 : (value >= 17 ? 17 : (value >= 7 ? 7 : (value >= 3 ? 3 : 1)))))))));
+         if (expValue >= 2477) {
-     }
+             return 2477;
- 
+         } else if (expValue >= 1237) {