Almost all patches

patches/server/Added-EntityToggleSitEvent.patch

@@ -34,16 +34,16 @@ diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-@@ -0,0 +0,0 @@ public class Fox extends Animal {
+@@ -0,0 +0,0 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
  
          this.setSleeping(nbt.getBoolean("Sleeping"));
-         this.setFoxType(Fox.Type.byName(nbt.getString("Type")));
+         this.setVariant(Fox.Type.byName(nbt.getString("Type")));
 -        this.setSitting(nbt.getBoolean("Sitting"));
 +        this.setSitting(nbt.getBoolean("Sitting"), false); // Paper
          this.setIsCrouching(nbt.getBoolean("Crouching"));
          if (this.level instanceof ServerLevel) {
              this.setTargetGoals();
-@@ -0,0 +0,0 @@ public class Fox extends Animal {
+@@ -0,0 +0,0 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
      }
  
      public void setSitting(boolean sitting) {

patches/server/Correctly-handle-interactions-with-items-on-cooldown.patch

@@ -14,8 +14,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          boolean cancelledBlock = false;
 +        boolean cancelledItem = false; // Paper - correctly handle items on cooldown
  
-         if (this.gameModeForPlayer == GameType.SPECTATOR) {
-             MenuProvider itileinventory = iblockdata.getMenuProvider(world, blockposition);
+         if (!iblockdata.getBlock().isEnabled(world.enabledFeatures())) {
+             return InteractionResult.FAIL;
 @@ -0,0 +0,0 @@ public class ServerPlayerGameMode {
          }
  

patches/server/Fire-EntityChangeBlockEvent-in-more-places.patch

@@ -78,23 +78,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              world.setBlockAndUpdate(blockposition1Final, iblockdata1); // CraftBukkit - decompile error
          });
          world.levelEvent(3002, blockposition1, -1);
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/TryLaySpawnOnWaterNearLand.java b/src/main/java/net/minecraft/world/entity/ai/behavior/TryLaySpawnOnWaterNearLand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/TryLaySpawnOnWaterNearLand.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/TryLaySpawnOnWaterNearLand.java
-@@ -0,0 +0,0 @@ public class TryLaySpawnOnWaterNearLand extends Behavior<Frog> {
-             if (world.getBlockState(blockPos2).getCollisionShape(world, blockPos2).getFaceShape(Direction.UP).isEmpty() && world.getFluidState(blockPos2).is(Fluids.WATER)) {
-                 BlockPos blockPos3 = blockPos2.above();
-                 if (world.getBlockState(blockPos3).isAir()) {
-+                    // Paper start
-+                    if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, blockPos3, this.spawnBlock.defaultBlockState()).isCancelled()) {
-+                        entity.getBrain().eraseMemory(this.memoryModule); // forgot pregnant memory
-+                        return;
-+                    }
-+                    // Paper end
-                     world.setBlock(blockPos3, this.spawnBlock.defaultBlockState(), 3);
-                     world.playSound((Player)null, entity, SoundEvents.FROG_LAY_SPAWN, SoundSource.BLOCKS, 1.0F, 1.0F);
-                     entity.getBrain().eraseMemory(this.memoryModule);
 diff --git a/src/main/java/net/minecraft/world/item/AxeItem.java b/src/main/java/net/minecraft/world/item/AxeItem.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/item/AxeItem.java

patches/server/Missing-eating-regain-reason.patch

@@ -8,7 +8,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -0,0 +0,0 @@ public class Cat extends TamableAnimal {
+@@ -0,0 +0,0 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
                      if (!(item instanceof DyeItem)) {
                          if (item.isEdible() && this.isFood(itemstack) && this.getHealth() < this.getMaxHealth()) {
                              this.usePlayerItem(player, hand, itemstack);
@@ -21,7 +21,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -0,0 +0,0 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
+@@ -0,0 +0,0 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          }
  
          if (this.getHealth() < this.getMaxHealth() && f > 0.0F) {

patches/server/Missing-effect-cause.patch

@@ -8,7 +8,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -0,0 +0,0 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
+@@ -0,0 +0,0 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
              player.addEffect(new MobEffectInstance(MobEffects.REGENERATION, i, 0), this, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.AXOLOTL); // CraftBukkit
          }
  
@@ -35,11 +35,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java
 +++ b/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java
 @@ -0,0 +0,0 @@ public class SuspiciousStewItem extends Item {
- 
-                 MobEffect mobEffect = MobEffect.byId(compoundTag2.getInt("EffectId"));
-                 if (mobEffect != null) {
--                    user.addEffect(new MobEffectInstance(mobEffect, j));
-+                    user.addEffect(new MobEffectInstance(mobEffect, j), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.FOOD); // Paper
-                 }
-             }
-         }
+     @Override
+     public ItemStack finishUsingItem(ItemStack stack, Level world, LivingEntity user) {
+         ItemStack itemStack = super.finishUsingItem(stack, world, user);
+-        listPotionEffects(itemStack, user::addEffect);
++        listPotionEffects(itemStack, effect -> user.addEffect(effect, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.FOOD)); // Paper
+         return user instanceof Player && ((Player)user).getAbilities().instabuild ? itemStack : new ItemStack(Items.BOWL);
+     }
+ }

patches/server/Set-position-before-player-sending-on-dimension-chan.patch

@@ -15,6 +15,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  // CraftBukkit end
                  this.setLevel(worldserver);
 +                this.moveTo(exit.getX(), exit.getY(), exit.getZ(), exit.getYaw(), exit.getPitch()); // Paper - Set the location before
-                 worldserver.addDuringPortalTeleport(this);
                  this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
-                 this.connection.resetPosition(); // CraftBukkit - sync position after changing it (from PortalTravelAgent#findAndteleport)
+                 this.connection.resetPosition();
+                 worldserver.addDuringPortalTeleport(this);

patches/server/fix-Jigsaw-block-kicking-user.patch

@@ -11,7 +11,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class JigsawBlockEntity extends BlockEntity {
      public void generate(ServerLevel world, int maxDepth, boolean keepJigsaws) {
          BlockPos blockPos = this.getBlockPos().relative(this.getBlockState().getValue(JigsawBlock.ORIENTATION).front());
-         Registry<StructureTemplatePool> registry = world.registryAccess().registryOrThrow(Registry.TEMPLATE_POOL_REGISTRY);
+         Registry<StructureTemplatePool> registry = world.registryAccess().registryOrThrow(Registries.TEMPLATE_POOL);
 -        Holder<StructureTemplatePool> holder = registry.getHolderOrThrow(this.pool);
 +        // Paper start - Replace getHolderOrThrow with a null check
 +        Holder<StructureTemplatePool> holder = registry.getHolder(this.pool).orElse(null);

patches/unapplied/server/Fix-nothing-mlg.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: FriwiDev <friwidev@gmail.com>
-Date: Mon, 3 Oct 2022 18:16:30 +0200
-Subject: [PATCH] Fix nothing mlg
-
-The issue here is that when jumping and sneaking right before
-the end of a long fall, the client will send incorrect move
-packets resulting in a teleport back. Due to this, the move
-packet (impact) of the player will not be considered for fall
-damage. The following move packet to the impact packet will
-have a positive y-value again due to the player jumping,
-resulting in a fall damage reset.
-
-Solution: Apply fall damage also while moving wrongly, but
-supply the real values the player sent to the damage calculation.
-This will not have any real negative effect, as the
-doCheckFallDamage method is meant to be called repeatedly anyway.
-
-Mojira-ID: MC-255653
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-                             }
-                             if (!this.player.noPhysics && !this.player.isSleeping() && teleportBack) { // Paper end - optimise out extra getCubes
-                                 this.internalTeleport(d3, d4, d5, f, f1, Collections.emptySet(), false); // CraftBukkit - SPIGOT-1807: Don't call teleport event, when the client thinks the player is falling, because the chunks are not loaded on the client yet.
-+                                this.player.doCheckFallDamage(this.player.getY() - prevY, packet.isOnGround()); // Paper - fix nothing mlg (sneaking and jumping before impact)
-                             } else {
-                                 // CraftBukkit start - fire PlayerMoveEvent
-                                 // Rest to old location first