apply 16 more patches

patches/server/0016-Fix-MC-31819.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-31819
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d00035e31cf4773a418d1cc6a6018d08e6b558f0..9f5153580f96f643240a8817a74a47b22e2a85cc 100644
+index 20c3d3c9d2150574e9b4761dc1bda11cee04862f..7d15ddcf7d2a7bcdd6a7bebfaef21b2b486c7b14 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1968,6 +1968,11 @@ public abstract class Player extends LivingEntity {
+@@ -1974,6 +1974,11 @@ public abstract class Player extends LivingEntity {
      }
  
      public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) {

patches/server/0017-lithium-collections.goals.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] lithium: collections.goals
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index 02978315bc2b828cc603ce7478408f3f82c249c2..d8ee71cb3afc0f63669d26c4160f7cd7ed2fd453 100644
+index 8a70bc63e12838f45fa3eade74f2899438715886..93a97455587db28fed1b2fa7ee8063ad08c5120e 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 @@ -13,6 +13,7 @@ import java.util.function.Supplier;

patches/server/0018-Reduce-sensor-work.patch

@@ -7,10 +7,10 @@ Original project: Bloom-host/Petal
 Link: https://github.com/Bloom-host/Petal
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 49906b4dc8392eee592215d0b4cba85267a875fc..e8cf6062fa427a2efdaca1e354805aa4cd58a2e0 100644
+index 4604e63cec3c25a1257892d4c1ea9db098815b93..b7856f4a41ba44e7bd30bd8917524aca813a32ba 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1037,20 +1037,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1038,20 +1038,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
  
          if (entity != null) {

patches/server/0019-lithium-ai.raid.patch

@@ -10,10 +10,10 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raid.java b/src/main/java/net/minecraft/world/entity/raid/Raid.java
-index f7399737548483905f3b5c08a03876b0da54b714..008d1f12cf05c31f45f7c17970fc5bfb80369e26 100644
+index eaa2943b667967f93f28d9d794d702fdaeb670ec..0e780da8dc230b27eddb01d1fa8bf2d8b5994158 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raid.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java
-@@ -107,6 +107,7 @@ public class Raid {
+@@ -106,6 +106,7 @@ public class Raid {
      private Raid.RaidStatus status;
      private int celebrationTicks;
      private Optional<BlockPos> waveSpawnPos;
@@ -21,7 +21,7 @@ index f7399737548483905f3b5c08a03876b0da54b714..008d1f12cf05c31f45f7c17970fc5bfb
  
      public Raid(int id, ServerLevel world, BlockPos pos) {
          this.raidEvent = new ServerBossEvent(Raid.RAID_NAME_COMPONENT, BossEvent.BossBarColor.RED, BossEvent.BossBarOverlay.NOTCHED_10);
-@@ -271,6 +272,12 @@ public class Raid {
+@@ -273,6 +274,12 @@ public class Raid {
  
      public void tick() {
          if (!this.isStopped()) {
@@ -34,7 +34,7 @@ index f7399737548483905f3b5c08a03876b0da54b714..008d1f12cf05c31f45f7c17970fc5bfb
              if (this.status == Raid.RaidStatus.ONGOING) {
                  boolean flag = this.active;
  
-@@ -637,9 +644,15 @@ public class Raid {
+@@ -641,9 +648,15 @@ public class Raid {
  
      }
  

patches/server/0021-Fix-MC-2025.patch

@@ -7,10 +7,10 @@ Original post on Mojira: https://bugs.mojang.com/browse/MC-2025
 Fix taken from Reddit: https://redd.it/8pgd4q
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 95b6639d0075c2b86f83718b3093f972d2e89b83..51b31ac8526a35e460c87ae467413db1f7c41752 100644
+index d9c33726e4ef6199ef5d060e660c2ec5f18b2dfa..391e4c3f91ec67adb409753c401e9f8586baf30a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2490,6 +2490,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2439,6 +2439,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  nbt.putBoolean("Purpur.FireImmune", immuneToFire);
              }
              // Purpur end
@@ -28,7 +28,7 @@ index 95b6639d0075c2b86f83718b3093f972d2e89b83..51b31ac8526a35e460c87ae467413db1
              return nbt;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2567,6 +2578,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2516,6 +2527,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                          this.reapplyPosition();
                      }
  

patches/server/0022-lithium-collections.gamerules.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] lithium: collections.gamerules
 
 
 diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
-index 6fa00d9239546aa82b9e92e25a33103868084c38..d91f1c58d8176036737ed2ad7914d27c3d684d6c 100644
+index 6639902efb85b4f49f26ba5f90556fb871ef8a0e..42dfcd2e9e794e6b48aec8c34618065d7a740c6c 100644
 --- a/src/main/java/net/minecraft/world/level/GameRules.java
 +++ b/src/main/java/net/minecraft/world/level/GameRules.java
 @@ -27,6 +27,7 @@ import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
@@ -16,7 +16,7 @@ index 6fa00d9239546aa82b9e92e25a33103868084c38..d91f1c58d8176036737ed2ad7914d27c
  
  public class GameRules {
  
-@@ -127,7 +128,7 @@ public class GameRules {
+@@ -137,7 +138,7 @@ public class GameRules {
      }
  
      private GameRules(Map<GameRules.Key<?>, GameRules.Value<?>> rules) {

patches/server/0024-Fix-MC-65198.patch

@@ -27,7 +27,7 @@ index a578882b64c581ef4f47fa483a9f2988cfa4c8cf..0660c07e1f360cb5e0a865a6b7574ea1
          }
  
 diff --git a/src/main/java/net/minecraft/world/inventory/ResultSlot.java b/src/main/java/net/minecraft/world/inventory/ResultSlot.java
-index 46d1f768e4dcc2942ee7af81ee2713df10251731..311c3054c4a44043ddc32b1560b9a4d65d494402 100644
+index 2554f7b1d687f83f42d69bf8ab54336ba793e301..10e609ca5c529ab604ef61cff5600d8a9303e3a2 100644
 --- a/src/main/java/net/minecraft/world/inventory/ResultSlot.java
 +++ b/src/main/java/net/minecraft/world/inventory/ResultSlot.java
 @@ -45,7 +45,7 @@ public class ResultSlot extends Slot {
@@ -40,10 +40,10 @@ index 46d1f768e4dcc2942ee7af81ee2713df10251731..311c3054c4a44043ddc32b1560b9a4d6
  
          Container var3 = this.container;
 diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-index 9699f97efcfecdc446ca25a6bab42cc484314cbb..6c95f72df1f3b6703c053f894857844abf5767da 100644
+index f8129dcdcae12ed66ec58e8c749fa88ec3cd85d8..c90eed190d059dc5eb923cda39019a754d19ed05 100644
 --- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-@@ -257,6 +257,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
+@@ -258,6 +258,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
              Item item = itemstack1.getItem();
  
              itemstack = itemstack1.copy();
@@ -51,7 +51,7 @@ index 9699f97efcfecdc446ca25a6bab42cc484314cbb..6c95f72df1f3b6703c053f894857844a
              if (slot == 1) {
                  item.onCraftedBy(itemstack1, player.level(), player);
                  if (!this.moveItemStackTo(itemstack1, 2, 38, true)) {
-@@ -289,7 +290,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
+@@ -290,7 +291,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
                  return ItemStack.EMPTY;
              }
  

patches/server/0025-Make-entity-goals-public.patch

@@ -90,10 +90,10 @@ index 6c04c8e7776b2830ac368229da834532e8ce163e..97a65480a9eb1d67b243b39d8aa1d7c1
          BaseBeeGoal() {}
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 3347b39fa1bc3308aa3b70b4169523885b91a047..1f020ef5a22952bbdfc2af1f7a924c61cac91cca 100644
+index 6e5b4a50b8d2dddbd7f099426b4866b35bcb798a..2bcd475cca90d356de056f9b8f023d0d6392fe44 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -562,7 +562,7 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
+@@ -568,7 +568,7 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
          }
      }
  
@@ -102,7 +102,7 @@ index 3347b39fa1bc3308aa3b70b4169523885b91a047..1f020ef5a22952bbdfc2af1f7a924c61
  
          private final Cat cat;
          @Nullable
-@@ -708,7 +708,7 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
+@@ -714,7 +714,7 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
          }
      }
  
@@ -125,7 +125,7 @@ index 06d52d8b61abc4dbbdc953bfed2e688be377b3cc..a5490068d200ed78ca720ae804a1b26f
          this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D));
          this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 15.0F, 1.0F));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index f1e410b602bf0d5520f8e9340f7b8b9e25ca4d39..998a7b47fded2c4851489400ac4ff455cb2efc14 100644
+index ffe956f200dd0b4148043d0d7f2eac007a9f22b1..a5608ddd34afd96ac166758f5d8ec88ed92d34cd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 @@ -97,7 +97,7 @@ public class Vindicator extends AbstractIllager {
@@ -134,11 +134,11 @@ index f1e410b602bf0d5520f8e9340f7b8b9e25ca4d39..998a7b47fded2c4851489400ac4ff455
          this.goalSelector.addGoal(2, new AbstractIllager.RaiderOpenDoorGoal(this));
 -        this.goalSelector.addGoal(3, new Raider.HoldGroundAttackGoal(this, 10.0F));
 +        this.goalSelector.addGoal(3, new HoldGroundAttackGoal(this, 10.0F));
-         this.goalSelector.addGoal(4, new Vindicator.VindicatorMeleeAttackGoal(this));
+         this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.0D, false));
          this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-index 822dd4265ce02252afadbc652064450b7dfd7e0d..a0736fdd542c7c21125ed3c31b4ed795926689b2 100644
+index 300411e88cdaef7e0ce280edbd5f18fa8d004a33..80e0a66abd9cd6ad9135658adb3044f97e0b7ba1 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
 @@ -352,7 +352,7 @@ public abstract class Raider extends PatrollingMonster {

patches/server/0026-Fix-MC-7569.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix MC-7569
 Original post on Mojira: https://bugs.mojang.com/browse/MC-7569
 
 diff --git a/src/main/java/net/minecraft/server/rcon/RconConsoleSource.java b/src/main/java/net/minecraft/server/rcon/RconConsoleSource.java
-index c323245efdd711ec4299dd0be66d5dad1fbf2b3e..da11b58b1e5e77a3c527f5778cfe10c79bdd88b0 100644
+index a04cf04cb694237ec77b38fc576f0dfc9264a25a..138a4394756ccfe5e9918420527dae70600a9e7b 100644
 --- a/src/main/java/net/minecraft/server/rcon/RconConsoleSource.java
 +++ b/src/main/java/net/minecraft/server/rcon/RconConsoleSource.java
 @@ -55,7 +55,7 @@ public class RconConsoleSource implements CommandSource {

patches/server/0027-Fix-MC-93018.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-93018
 Original post on Mojira: https://bugs.mojang.com/browse/MC-93018
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 64bceae4d06b35fcbecb0daca2496ba30e39d995..139550c9aeceaa31c09429e5bff13ddc50ef6827 100644
+index 5d49ed7ddf44a3d549b178ae548664194967776b..8ff325a6f8e70be3df989296044d00931814a10a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -653,14 +653,17 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -655,14 +655,17 @@ public class Wolf extends TamableAnimal implements NeutralMob {
      public boolean canMate(Animal other) {
          if (other == this) {
              return false;

patches/server/0028-Do-not-process-chat-commands-before-player-has-joine.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Do not process chat/commands before player has joined
 
 
 diff --git a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
-index 50878e4948df45bc2928edbe373be639d133060f..429efd08e218a780d181d24f0522b0e499fadbf3 100644
+index 512afaa97e89e3beb92cf2ebc46248eddd22cf5c..b8fa8f551c95503be60f990099b2d41296ea91de 100644
 --- a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
 +++ b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
-@@ -167,4 +167,9 @@ public class DivineConfig {
+@@ -162,4 +162,9 @@ public class DivineConfig {
-     private static void doOptimizeVarints() {
+     private static void allowAnyUsername() {
-         doOptimizeVarints = getBoolean("settings.optimization.optimize-varints", doOptimizeVarints);
+         allowAnyUsername = getBoolean("settings.player.allow-any-username", allowAnyUsername);
      }
 +
 +    public static boolean doNotProcessChatCommands = true;
@@ -20,10 +20,10 @@ index 50878e4948df45bc2928edbe373be639d133060f..429efd08e218a780d181d24f0522b0e4
  }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 255b422078880b46dfa6f5140f6c92fef057d09e..0b2b8d6417d72860763aa6f2872280229a89464e 100644
+index ee9845804d2ad59bdde78e778c28690746877541..29556514d97ac8bd8e4147e1471ba1f6cf63b323 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -5,6 +5,7 @@ import com.google.common.primitives.Floats;
+@@ -6,6 +6,7 @@ import com.mojang.authlib.GameProfile;
  import com.mojang.brigadier.ParseResults;
  import com.mojang.brigadier.StringReader;
  import com.mojang.logging.LogUtils;
@@ -31,7 +31,7 @@ index 255b422078880b46dfa6f5140f6c92fef057d09e..0b2b8d6417d72860763aa6f287228022
  import it.unimi.dsi.fastutil.ints.Int2ObjectMap.Entry;
  import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
  import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-@@ -2484,6 +2485,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2311,6 +2312,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
              }); // Paper - push to main
              return Optional.empty();

patches/server/0029-Fix-memory-leak.patch

@@ -3,7 +3,6 @@ From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
 Date: Sat, 10 Jun 2023 13:06:44 +0300
 Subject: [PATCH] Fix memory leak
 
-removed due pufferfish patches was added back
 
 diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
 index 65012a12e1430956ef55ced56773e6354ac26444..2bcd3ee3bbdf246ef429a8310ca96ba3fb4afd2c 100644