From 578b0929e3b5b83fcb1acaf465b858fa0f3076b7 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Fri, 24 Jun 2022 14:27:25 +0200
Subject: [PATCH 1/6] Add xp orb spawn reason for frogs

---
 ...Orbs-API-for-Reason-Source-Triggering-play.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 88bd75f5c102..8d803c97b08c 100644
--- a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -181,6 +181,19 @@ index 7c90063be2a7eb66b7f0981059018f20413256c6..37125ffe47fcd5fe93ab62ad8a46e818
              }
  
          }
+diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+index 01f8d11ee4441a1c4d87427e3f9bcd7155259a5b..f5b2c7db33a4d50d42440ab8027be1755ccc70eb 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
++++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+@@ -274,7 +274,7 @@ public class Frog extends Animal {
+         this.getBrain().setMemory(MemoryModuleType.IS_PREGNANT, Unit.INSTANCE);
+         world.broadcastEntityEvent(this, (byte)18);
+         if (world.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
+-            world.addFreshEntity(new ExperienceOrb(world, this.getX(), this.getY(), this.getZ(), this.getRandom().nextInt(7) + 1));
++            world.addFreshEntity(new ExperienceOrb(world, this.getX(), this.getY(), this.getZ(), this.getRandom().nextInt(7) + 1, org.bukkit.entity.ExperienceOrb.SpawnReason.BREED, serverPlayer)); // Paper
+         }
+ 
+     }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 index 0dff7a47ecac1916ad23739fbb06ddd0f0052a65..d0ebcc23d863be630b55245aa2604c108ee6c93a 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java

From 5bbf80e30adc9cf04d83d80bf2051454d88bd1e8 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Sat, 25 Jun 2022 23:07:49 +0200
Subject: [PATCH 2/6] Add deprecated annot

---
 ...ceOrbs-API-for-Reason-Source-Triggering-play.patch | 11 ++++++-----
 patches/server/0167-PlayerPickupExperienceEvent.patch |  4 ++--
 ...MC-135506-Experience-should-save-as-Integers.patch |  6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 8d803c97b08c..3f61e57d61ae 100644
--- a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -21,10 +21,10 @@ index cd3b4c97374d44f5a0e710e03f4ac38938757e25..b18bb06caf5f034dffbb72120c8f21da
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index b3433ce9c722bdab81848a6c2d121ca510c48509..227aca795efc99c4f81dfb30c00d31d2d7524542 100644
+index b3433ce9c722bdab81848a6c2d121ca510c48509..2ccc8fb14c68dbdaf9c43bfaa173e65ddc08d47a 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -37,13 +37,63 @@ public class ExperienceOrb extends Entity {
+@@ -37,13 +37,64 @@ public class ExperienceOrb extends Entity {
      public int value;
      private int count;
      private Player followingPlayer;
@@ -67,6 +67,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..227aca795efc99c4f81dfb30c00d31d2
 +        nbttagcompound.put("Paper.ExpData", comp);
 +    }
  
++    @Deprecated
      public ExperienceOrb(Level world, double x, double y, double z, int amount) {
 +        this(world, x, y, z, amount, null, null);
 +    }
@@ -90,7 +91,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..227aca795efc99c4f81dfb30c00d31d2
      }
  
      public ExperienceOrb(EntityType<? extends ExperienceOrb> type, Level world) {
-@@ -153,12 +203,20 @@ public class ExperienceOrb extends Entity {
+@@ -153,12 +204,20 @@ public class ExperienceOrb extends Entity {
      }
  
      public static void award(ServerLevel world, Vec3 pos, int amount) {
@@ -112,7 +113,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..227aca795efc99c4f81dfb30c00d31d2
              }
          }
  
-@@ -228,6 +286,7 @@ public class ExperienceOrb extends Entity {
+@@ -228,6 +287,7 @@ public class ExperienceOrb extends Entity {
          nbt.putShort("Age", (short) this.age);
          nbt.putShort("Value", (short) this.value);
          nbt.putInt("Count", this.count);
@@ -120,7 +121,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..227aca795efc99c4f81dfb30c00d31d2
      }
  
      @Override
-@@ -236,6 +295,7 @@ public class ExperienceOrb extends Entity {
+@@ -236,6 +296,7 @@ public class ExperienceOrb extends Entity {
          this.age = nbt.getShort("Age");
          this.value = nbt.getShort("Value");
          this.count = Math.max(nbt.getInt("Count"), 1);
diff --git a/patches/server/0167-PlayerPickupExperienceEvent.patch b/patches/server/0167-PlayerPickupExperienceEvent.patch
index 6b3e21f67753..762a8579f697 100644
--- a/patches/server/0167-PlayerPickupExperienceEvent.patch
+++ b/patches/server/0167-PlayerPickupExperienceEvent.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 227aca795efc99c4f81dfb30c00d31d2d7524542..6bf6d6629dfb9338d3e34f433a5698904a2acdad 100644
+index 2ccc8fb14c68dbdaf9c43bfaa173e65ddc08d47a..8a8454ab292fe92719a81575e129a6b84232838b 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -301,7 +301,7 @@ public class ExperienceOrb extends Entity {
+@@ -302,7 +302,7 @@ public class ExperienceOrb extends Entity {
      @Override
      public void playerTouch(Player player) {
          if (!this.level.isClientSide) {
diff --git a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
index c0c7c171ff55..a24022fa53b8 100644
--- a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
+++ b/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] MC-135506: Experience should save as Integers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 6bf6d6629dfb9338d3e34f433a5698904a2acdad..4848f26a006f4d4df620ded526134b3b39e90d29 100644
+index 8a8454ab292fe92719a81575e129a6b84232838b..9fb639be67d23e73285693329ea8187a07ebebff 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -284,7 +284,7 @@ public class ExperienceOrb extends Entity {
+@@ -285,7 +285,7 @@ public class ExperienceOrb extends Entity {
      public void addAdditionalSaveData(CompoundTag nbt) {
          nbt.putShort("Health", (short) this.health);
          nbt.putShort("Age", (short) this.age);
@@ -17,7 +17,7 @@ index 6bf6d6629dfb9338d3e34f433a5698904a2acdad..4848f26a006f4d4df620ded526134b3b
          nbt.putInt("Count", this.count);
          this.savePaperNBT(nbt); // Paper
      }
-@@ -293,7 +293,7 @@ public class ExperienceOrb extends Entity {
+@@ -294,7 +294,7 @@ public class ExperienceOrb extends Entity {
      public void readAdditionalSaveData(CompoundTag nbt) {
          this.health = nbt.getShort("Health");
          this.age = nbt.getShort("Age");

From acc96e61daf5dad9d3faf4c77fa8ac5857a12f20 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Wed, 6 Jul 2022 15:31:11 +0200
Subject: [PATCH 3/6] Decompile issue + annot

---
 patches/server/0005-MC-Dev-fixes.patch        | 13 +++++++++++
 ...PI-for-Reason-Source-Triggering-play.patch | 23 +++++++++++++------
 .../0167-PlayerPickupExperienceEvent.patch    |  4 ++--
 ...6-Experience-should-save-as-Integers.patch |  6 ++---
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/patches/server/0005-MC-Dev-fixes.patch b/patches/server/0005-MC-Dev-fixes.patch
index 478d3ead35f7..31d673ce509b 100644
--- a/patches/server/0005-MC-Dev-fixes.patch
+++ b/patches/server/0005-MC-Dev-fixes.patch
@@ -192,6 +192,19 @@ index 8760e4199a1c8ae1a784f885923616f3740fe120..bb2be6eea7a0cff4cc70bd43738b1ce2
              return instance.group(RecordCodecBuilder.point(updateListener), Codec.BOOL.optionalFieldOf("Valid", Boolean.valueOf(false)).forGetter((poiSet) -> {
                  return poiSet.isValid;
              }), PoiRecord.codec(updateListener).listOf().fieldOf("Records").forGetter((poiSet) -> {
+diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+index 01f8d11ee4441a1c4d87427e3f9bcd7155259a5b..530f2ef390360dab60e0ac5dc66db60c9c4bd7f5 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
++++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+@@ -105,7 +105,7 @@ public class Frog extends Animal {
+ 
+     @Override
+     public Brain<Frog> getBrain() {
+-        return super.getBrain();
++        return (Brain<Frog>) super.getBrain();
+     }
+ 
+     @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 index 64314cf4dc53a1a0a5f676fa00503858e0120dfa..45741410a13cffe3419e34b5607b048bbcf1c3ff 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
diff --git a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 3f61e57d61ae..56e2e20fc36b 100644
--- a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -21,10 +21,19 @@ index cd3b4c97374d44f5a0e710e03f4ac38938757e25..b18bb06caf5f034dffbb72120c8f21da
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index b3433ce9c722bdab81848a6c2d121ca510c48509..2ccc8fb14c68dbdaf9c43bfaa173e65ddc08d47a 100644
+index b3433ce9c722bdab81848a6c2d121ca510c48509..e579c5eb61ef759448e9c231d1fd0549853e5028 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -37,13 +37,64 @@ public class ExperienceOrb extends Entity {
+@@ -3,6 +3,8 @@ package net.minecraft.world.entity;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map.Entry;
++
++import io.papermc.paper.annotation.DoNotUse;
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.nbt.CompoundTag;
+ import net.minecraft.network.protocol.Packet;
+@@ -37,13 +39,64 @@ public class ExperienceOrb extends Entity {
      public int value;
      private int count;
      private Player followingPlayer;
@@ -67,7 +76,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..2ccc8fb14c68dbdaf9c43bfaa173e65d
 +        nbttagcompound.put("Paper.ExpData", comp);
 +    }
  
-+    @Deprecated
++    @DoNotUse
      public ExperienceOrb(Level world, double x, double y, double z, int amount) {
 +        this(world, x, y, z, amount, null, null);
 +    }
@@ -91,7 +100,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..2ccc8fb14c68dbdaf9c43bfaa173e65d
      }
  
      public ExperienceOrb(EntityType<? extends ExperienceOrb> type, Level world) {
-@@ -153,12 +204,20 @@ public class ExperienceOrb extends Entity {
+@@ -153,12 +206,20 @@ public class ExperienceOrb extends Entity {
      }
  
      public static void award(ServerLevel world, Vec3 pos, int amount) {
@@ -113,7 +122,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..2ccc8fb14c68dbdaf9c43bfaa173e65d
              }
          }
  
-@@ -228,6 +287,7 @@ public class ExperienceOrb extends Entity {
+@@ -228,6 +289,7 @@ public class ExperienceOrb extends Entity {
          nbt.putShort("Age", (short) this.age);
          nbt.putShort("Value", (short) this.value);
          nbt.putInt("Count", this.count);
@@ -121,7 +130,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..2ccc8fb14c68dbdaf9c43bfaa173e65d
      }
  
      @Override
-@@ -236,6 +296,7 @@ public class ExperienceOrb extends Entity {
+@@ -236,6 +298,7 @@ public class ExperienceOrb extends Entity {
          this.age = nbt.getShort("Age");
          this.value = nbt.getShort("Value");
          this.count = Math.max(nbt.getInt("Count"), 1);
@@ -183,7 +192,7 @@ index 7c90063be2a7eb66b7f0981059018f20413256c6..37125ffe47fcd5fe93ab62ad8a46e818
  
          }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index 01f8d11ee4441a1c4d87427e3f9bcd7155259a5b..f5b2c7db33a4d50d42440ab8027be1755ccc70eb 100644
+index 530f2ef390360dab60e0ac5dc66db60c9c4bd7f5..cbdcccd3f3fe8301ddf7b85249a2f6d3592e4326 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 @@ -274,7 +274,7 @@ public class Frog extends Animal {
diff --git a/patches/server/0167-PlayerPickupExperienceEvent.patch b/patches/server/0167-PlayerPickupExperienceEvent.patch
index 762a8579f697..ea9cbae93a86 100644
--- a/patches/server/0167-PlayerPickupExperienceEvent.patch
+++ b/patches/server/0167-PlayerPickupExperienceEvent.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 2ccc8fb14c68dbdaf9c43bfaa173e65ddc08d47a..8a8454ab292fe92719a81575e129a6b84232838b 100644
+index e579c5eb61ef759448e9c231d1fd0549853e5028..3e9b1ef9e752bc006f7204a57ac96afd6f90a023 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -302,7 +302,7 @@ public class ExperienceOrb extends Entity {
+@@ -304,7 +304,7 @@ public class ExperienceOrb extends Entity {
      @Override
      public void playerTouch(Player player) {
          if (!this.level.isClientSide) {
diff --git a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
index a24022fa53b8..cd73db961aec 100644
--- a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
+++ b/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] MC-135506: Experience should save as Integers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 8a8454ab292fe92719a81575e129a6b84232838b..9fb639be67d23e73285693329ea8187a07ebebff 100644
+index 3e9b1ef9e752bc006f7204a57ac96afd6f90a023..f17c18b41fba45d93b10ad070ef9aa6dccc9ad39 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -285,7 +285,7 @@ public class ExperienceOrb extends Entity {
+@@ -287,7 +287,7 @@ public class ExperienceOrb extends Entity {
      public void addAdditionalSaveData(CompoundTag nbt) {
          nbt.putShort("Health", (short) this.health);
          nbt.putShort("Age", (short) this.age);
@@ -17,7 +17,7 @@ index 8a8454ab292fe92719a81575e129a6b84232838b..9fb639be67d23e73285693329ea8187a
          nbt.putInt("Count", this.count);
          this.savePaperNBT(nbt); // Paper
      }
-@@ -294,7 +294,7 @@ public class ExperienceOrb extends Entity {
+@@ -296,7 +296,7 @@ public class ExperienceOrb extends Entity {
      public void readAdditionalSaveData(CompoundTag nbt) {
          this.health = nbt.getShort("Health");
          this.age = nbt.getShort("Age");

From 23aef64a5ea64992675b178e1b8b330cb204346d Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Wed, 6 Jul 2022 15:33:15 +0200
Subject: [PATCH 4/6] Inline import

---
 ...PI-for-Reason-Source-Triggering-play.patch | 21 ++++++-------------
 .../0167-PlayerPickupExperienceEvent.patch    |  4 ++--
 ...6-Experience-should-save-as-Integers.patch |  6 +++---
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 56e2e20fc36b..df2659c4cbe2 100644
--- a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -21,19 +21,10 @@ index cd3b4c97374d44f5a0e710e03f4ac38938757e25..b18bb06caf5f034dffbb72120c8f21da
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index b3433ce9c722bdab81848a6c2d121ca510c48509..e579c5eb61ef759448e9c231d1fd0549853e5028 100644
+index b3433ce9c722bdab81848a6c2d121ca510c48509..154e86ea88425c24683df11772a677267e6498b4 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -3,6 +3,8 @@ package net.minecraft.world.entity;
- import java.util.Iterator;
- import java.util.List;
- import java.util.Map.Entry;
-+
-+import io.papermc.paper.annotation.DoNotUse;
- import net.minecraft.core.BlockPos;
- import net.minecraft.nbt.CompoundTag;
- import net.minecraft.network.protocol.Packet;
-@@ -37,13 +39,64 @@ public class ExperienceOrb extends Entity {
+@@ -37,13 +37,64 @@ public class ExperienceOrb extends Entity {
      public int value;
      private int count;
      private Player followingPlayer;
@@ -76,7 +67,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..e579c5eb61ef759448e9c231d1fd0549
 +        nbttagcompound.put("Paper.ExpData", comp);
 +    }
  
-+    @DoNotUse
++    @io.papermc.paper.annotation.DoNotUse
      public ExperienceOrb(Level world, double x, double y, double z, int amount) {
 +        this(world, x, y, z, amount, null, null);
 +    }
@@ -100,7 +91,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..e579c5eb61ef759448e9c231d1fd0549
      }
  
      public ExperienceOrb(EntityType<? extends ExperienceOrb> type, Level world) {
-@@ -153,12 +206,20 @@ public class ExperienceOrb extends Entity {
+@@ -153,12 +204,20 @@ public class ExperienceOrb extends Entity {
      }
  
      public static void award(ServerLevel world, Vec3 pos, int amount) {
@@ -122,7 +113,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..e579c5eb61ef759448e9c231d1fd0549
              }
          }
  
-@@ -228,6 +289,7 @@ public class ExperienceOrb extends Entity {
+@@ -228,6 +287,7 @@ public class ExperienceOrb extends Entity {
          nbt.putShort("Age", (short) this.age);
          nbt.putShort("Value", (short) this.value);
          nbt.putInt("Count", this.count);
@@ -130,7 +121,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..e579c5eb61ef759448e9c231d1fd0549
      }
  
      @Override
-@@ -236,6 +298,7 @@ public class ExperienceOrb extends Entity {
+@@ -236,6 +296,7 @@ public class ExperienceOrb extends Entity {
          this.age = nbt.getShort("Age");
          this.value = nbt.getShort("Value");
          this.count = Math.max(nbt.getInt("Count"), 1);
diff --git a/patches/server/0167-PlayerPickupExperienceEvent.patch b/patches/server/0167-PlayerPickupExperienceEvent.patch
index ea9cbae93a86..5153084e0aa7 100644
--- a/patches/server/0167-PlayerPickupExperienceEvent.patch
+++ b/patches/server/0167-PlayerPickupExperienceEvent.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index e579c5eb61ef759448e9c231d1fd0549853e5028..3e9b1ef9e752bc006f7204a57ac96afd6f90a023 100644
+index 154e86ea88425c24683df11772a677267e6498b4..34777f9311a80bf37e062206e6bc893cb0162179 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -304,7 +304,7 @@ public class ExperienceOrb extends Entity {
+@@ -302,7 +302,7 @@ public class ExperienceOrb extends Entity {
      @Override
      public void playerTouch(Player player) {
          if (!this.level.isClientSide) {
diff --git a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
index cd73db961aec..b1c34dd04f24 100644
--- a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
+++ b/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] MC-135506: Experience should save as Integers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 3e9b1ef9e752bc006f7204a57ac96afd6f90a023..f17c18b41fba45d93b10ad070ef9aa6dccc9ad39 100644
+index 34777f9311a80bf37e062206e6bc893cb0162179..df88b9d631c7c4b2e98e29844d0ca9f0cc48a89a 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -287,7 +287,7 @@ public class ExperienceOrb extends Entity {
+@@ -285,7 +285,7 @@ public class ExperienceOrb extends Entity {
      public void addAdditionalSaveData(CompoundTag nbt) {
          nbt.putShort("Health", (short) this.health);
          nbt.putShort("Age", (short) this.age);
@@ -17,7 +17,7 @@ index 3e9b1ef9e752bc006f7204a57ac96afd6f90a023..f17c18b41fba45d93b10ad070ef9aa6d
          nbt.putInt("Count", this.count);
          this.savePaperNBT(nbt); // Paper
      }
-@@ -296,7 +296,7 @@ public class ExperienceOrb extends Entity {
+@@ -294,7 +294,7 @@ public class ExperienceOrb extends Entity {
      public void readAdditionalSaveData(CompoundTag nbt) {
          this.health = nbt.getShort("Health");
          this.age = nbt.getShort("Age");

From 472e685abe09c1dd2295ff276b2987559eefefa8 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Wed, 6 Jul 2022 15:37:37 +0200
Subject: [PATCH 5/6] Missing comment!

---
 patches/server/0005-MC-Dev-fixes.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/server/0005-MC-Dev-fixes.patch b/patches/server/0005-MC-Dev-fixes.patch
index 31d673ce509b..80159200f2f2 100644
--- a/patches/server/0005-MC-Dev-fixes.patch
+++ b/patches/server/0005-MC-Dev-fixes.patch
@@ -193,7 +193,7 @@ index 8760e4199a1c8ae1a784f885923616f3740fe120..bb2be6eea7a0cff4cc70bd43738b1ce2
                  return poiSet.isValid;
              }), PoiRecord.codec(updateListener).listOf().fieldOf("Records").forGetter((poiSet) -> {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index 01f8d11ee4441a1c4d87427e3f9bcd7155259a5b..530f2ef390360dab60e0ac5dc66db60c9c4bd7f5 100644
+index 01f8d11ee4441a1c4d87427e3f9bcd7155259a5b..fe660bbaa4113fb2ffa1ea2f10e4e1e674fbb86d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 @@ -105,7 +105,7 @@ public class Frog extends Animal {
@@ -201,7 +201,7 @@ index 01f8d11ee4441a1c4d87427e3f9bcd7155259a5b..530f2ef390360dab60e0ac5dc66db60c
      @Override
      public Brain<Frog> getBrain() {
 -        return super.getBrain();
-+        return (Brain<Frog>) super.getBrain();
++        return (Brain<Frog>) super.getBrain(); // Paper - decompile fix
      }
  
      @Override

From f65a69f9e9773c87b099530d7b71a485dc5b0eb1 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Thu, 7 Jul 2022 21:20:40 +0200
Subject: [PATCH 6/6] Add missing annot

---
 ...Orbs-API-for-Reason-Source-Triggering-play.patch | 13 +++++++------
 .../server/0167-PlayerPickupExperienceEvent.patch   |  4 ++--
 ...-135506-Experience-should-save-as-Integers.patch |  6 +++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index df2659c4cbe2..c3bca094a3e9 100644
--- a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -21,10 +21,10 @@ index cd3b4c97374d44f5a0e710e03f4ac38938757e25..b18bb06caf5f034dffbb72120c8f21da
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index b3433ce9c722bdab81848a6c2d121ca510c48509..154e86ea88425c24683df11772a677267e6498b4 100644
+index b3433ce9c722bdab81848a6c2d121ca510c48509..16a1a005f2dda30cf804bf51638383ef3bfeb43e 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -37,13 +37,64 @@ public class ExperienceOrb extends Entity {
+@@ -37,13 +37,65 @@ public class ExperienceOrb extends Entity {
      public int value;
      private int count;
      private Player followingPlayer;
@@ -68,6 +68,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..154e86ea88425c24683df11772a67726
 +    }
  
 +    @io.papermc.paper.annotation.DoNotUse
++    @Deprecated
      public ExperienceOrb(Level world, double x, double y, double z, int amount) {
 +        this(world, x, y, z, amount, null, null);
 +    }
@@ -91,7 +92,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..154e86ea88425c24683df11772a67726
      }
  
      public ExperienceOrb(EntityType<? extends ExperienceOrb> type, Level world) {
-@@ -153,12 +204,20 @@ public class ExperienceOrb extends Entity {
+@@ -153,12 +205,20 @@ public class ExperienceOrb extends Entity {
      }
  
      public static void award(ServerLevel world, Vec3 pos, int amount) {
@@ -113,7 +114,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..154e86ea88425c24683df11772a67726
              }
          }
  
-@@ -228,6 +287,7 @@ public class ExperienceOrb extends Entity {
+@@ -228,6 +288,7 @@ public class ExperienceOrb extends Entity {
          nbt.putShort("Age", (short) this.age);
          nbt.putShort("Value", (short) this.value);
          nbt.putInt("Count", this.count);
@@ -121,7 +122,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..154e86ea88425c24683df11772a67726
      }
  
      @Override
-@@ -236,6 +296,7 @@ public class ExperienceOrb extends Entity {
+@@ -236,6 +297,7 @@ public class ExperienceOrb extends Entity {
          this.age = nbt.getShort("Age");
          this.value = nbt.getShort("Value");
          this.count = Math.max(nbt.getInt("Count"), 1);
@@ -183,7 +184,7 @@ index 7c90063be2a7eb66b7f0981059018f20413256c6..37125ffe47fcd5fe93ab62ad8a46e818
  
          }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index 530f2ef390360dab60e0ac5dc66db60c9c4bd7f5..cbdcccd3f3fe8301ddf7b85249a2f6d3592e4326 100644
+index fe660bbaa4113fb2ffa1ea2f10e4e1e674fbb86d..bb6063ae7f4438916306ce876057f7488537b444 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 @@ -274,7 +274,7 @@ public class Frog extends Animal {
diff --git a/patches/server/0167-PlayerPickupExperienceEvent.patch b/patches/server/0167-PlayerPickupExperienceEvent.patch
index 5153084e0aa7..f59d0999a56d 100644
--- a/patches/server/0167-PlayerPickupExperienceEvent.patch
+++ b/patches/server/0167-PlayerPickupExperienceEvent.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 154e86ea88425c24683df11772a677267e6498b4..34777f9311a80bf37e062206e6bc893cb0162179 100644
+index 16a1a005f2dda30cf804bf51638383ef3bfeb43e..80f4dfdbc410aa3346897e2ca63272a081712b6e 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -302,7 +302,7 @@ public class ExperienceOrb extends Entity {
+@@ -303,7 +303,7 @@ public class ExperienceOrb extends Entity {
      @Override
      public void playerTouch(Player player) {
          if (!this.level.isClientSide) {
diff --git a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
index b1c34dd04f24..8248a48e4a38 100644
--- a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
+++ b/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] MC-135506: Experience should save as Integers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 34777f9311a80bf37e062206e6bc893cb0162179..df88b9d631c7c4b2e98e29844d0ca9f0cc48a89a 100644
+index 80f4dfdbc410aa3346897e2ca63272a081712b6e..d6527396939d9a1dd2f1cfb6cb66dc64fa0e5332 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -285,7 +285,7 @@ public class ExperienceOrb extends Entity {
+@@ -286,7 +286,7 @@ public class ExperienceOrb extends Entity {
      public void addAdditionalSaveData(CompoundTag nbt) {
          nbt.putShort("Health", (short) this.health);
          nbt.putShort("Age", (short) this.age);
@@ -17,7 +17,7 @@ index 34777f9311a80bf37e062206e6bc893cb0162179..df88b9d631c7c4b2e98e29844d0ca9f0
          nbt.putInt("Count", this.count);
          this.savePaperNBT(nbt); // Paper
      }
-@@ -294,7 +294,7 @@ public class ExperienceOrb extends Entity {
+@@ -295,7 +295,7 @@ public class ExperienceOrb extends Entity {
      public void readAdditionalSaveData(CompoundTag nbt) {
          this.health = nbt.getShort("Health");
          this.age = nbt.getShort("Age");