diff --git a/patches/api/Add-experience-points-API.patch b/patches/api/Add-experience-points-API.patch
new file mode 100644
index 0000000000..eec8dbe92a
--- /dev/null
+++ b/patches/api/Add-experience-points-API.patch
@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lukas Planz <lukas.planz@web.de>
+Date: Tue, 5 Sep 2023 20:33:52 +0200
+Subject: [PATCH] Add experience points API
+
+
+diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
++++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * @param exp New total experience points
+      */
+     public void setTotalExperience(int exp);
++    // Paper start
++    /**
++     * Gets the players total amount of experience points he collected to reach the current level and level progress.
++     *
++     * <p>This method differs from {@link #getTotalExperience()} in that this method always returns an
++     * up-to-date value that reflects the players{@link #getLevel() level} and {@link #getExp() level progress}</p>
++     *
++     * @return Current total experience points
++     * @see #getLevel()
++     * @see #getExp()
++     * @see #setExperienceLevelAndProgress(int)
++     */
++    @org.jetbrains.annotations.Range(from = 0, to = Integer.MAX_VALUE) int calculateTotalExperiencePoints();
++
++    /**
++     * Updates the players level and level progress to that what would be reached when the total amount of experience
++     * had been collected.
++     *
++     * <p>This method differs from {@link #setTotalExperience(int)} in that this method actually updates the
++     * {@link #getLevel() level} and {@link #getExp() level progress} so that a subsequent call of
++     * {@link #calculateTotalExperiencePoints()} yields the same amount of points that have been set</p>
++     *
++     * @param totalExperience New total experience points
++     * @see #setLevel(int)
++     * @see #setExp(float)
++     * @see #calculateTotalExperiencePoints()
++     */
++    void setExperienceLevelAndProgress(@org.jetbrains.annotations.Range(from = 0, to = Integer.MAX_VALUE) int totalExperience);
++
++    /**
++     * Gets the total amount of experience points that are needed to reach the next level from zero progress towards it.
++     *
++     * <p>Can be used with {@link #getExp()} to calculate the current points for the current level and alike</p>
++     *
++     * @return The required experience points
++     * @see #getExp()
++     */
++    int getExperiencePointsNeededForNextLevel();
++    // Paper end
+ 
+     /**
+      * Send an experience change.
diff --git a/patches/server/Add-experience-points-API.patch b/patches/server/Add-experience-points-API.patch
new file mode 100644
index 0000000000..01f11a1cdf
--- /dev/null
+++ b/patches/server/Add-experience-points-API.patch
@@ -0,0 +1,73 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lukas Planz <lukas.planz@web.de>
+Date: Tue, 5 Sep 2023 20:34:20 +0200
+Subject: [PATCH] Add experience points API
+
+
+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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/player/Player.java
++++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+@@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity {
+     }
+ 
+     public int getXpNeededForNextLevel() {
+-        return this.experienceLevel >= 30 ? 112 + (this.experienceLevel - 30) * 9 : (this.experienceLevel >= 15 ? 37 + (this.experienceLevel - 15) * 5 : 7 + this.experienceLevel * 2);
++        return this.experienceLevel >= 30 ? 112 + (this.experienceLevel - 30) * 9 : (this.experienceLevel >= 15 ? 37 + (this.experienceLevel - 15) * 5 : 7 + this.experienceLevel * 2); // Paper - diff on change
+     }
+     // Paper start - send SoundEffect to everyone who can see fromEntity
+     private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         Preconditions.checkArgument(exp >= 0, "Total experience points must not be negative (%s)", exp);
+         this.getHandle().totalExperience = exp;
+     }
++    // Paper start
++    @Override
++    public int calculateTotalExperiencePoints() {
++        return calculateTotalExperiencePoints(this.getLevel()) + Math.round(this.getExperiencePointsNeededForNextLevel() * getExp());
++    }
++
++    @Override
++    public void setExperienceLevelAndProgress(final int totalExperience) {
++        Preconditions.checkArgument(totalExperience >= 0, "Total experience points must not be negative (%s)", totalExperience);
++        int level = calculateLevelsForExperiencePoints(totalExperience);
++        int remainingPoints = totalExperience - calculateTotalExperiencePoints(level);
++
++        this.getHandle().experienceLevel = level;
++        this.getHandle().experienceProgress = (float) remainingPoints / this.getExperiencePointsNeededForNextLevel();
++        this.getHandle().lastSentExp = -1;
++    }
++
++    @Override
++    public int getExperiencePointsNeededForNextLevel() {
++        return this.getHandle().getXpNeededForNextLevel();
++    }
++
++    // See https://minecraft.wiki/w/Experience#Leveling_up for reference
++    private int calculateTotalExperiencePoints(int level) {
++        if (level <= 16) {
++            return (int) (Math.pow(level, 2) + 6 * level);
++        } else if (level <= 31) {
++            return (int) (2.5 * Math.pow(level, 2) - 40.5 * level + 360.0);
++        } else {
++            return (int) (4.5 * Math.pow(level, 2) - 162.5 * level + 2220.0);
++        }
++    }
++
++    private int calculateLevelsForExperiencePoints(int points) {
++        if (points <= 352) { // Level 0-16
++            return (int) Math.floor(Math.sqrt(points + 9) - 3);
++        } else if (points <= 1507) { // Level 17-31
++            return (int) Math.floor(8.1 + Math.sqrt(0.4 * (points - (7839.0 / 40.0))));
++        } else { // 32+
++            return (int) Math.floor((325.0 / 18.0) + Math.sqrt((2.0 / 9.0) * (points - (54215.0 / 72.0))));
++        }
++    }
++    // Paper end
+ 
+     @Override
+     public void sendExperienceChange(float progress) {
diff --git a/patches/server/Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/Fire-CauldronLevelChange-on-initial-fill.patch
index e631e1e3ca..803e7b70cd 100644
--- a/patches/server/Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/Fire-CauldronLevelChange-on-initial-fill.patch
@@ -6,6 +6,46 @@ Subject: [PATCH] Fire CauldronLevelChange on initial fill
 Also don't fire level events or game events if stalactite
 drip is cancelled
 
+diff --git a/src/main/java/net/minecraft/core/cauldron/CauldronInteraction.java b/src/main/java/net/minecraft/core/cauldron/CauldronInteraction.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/core/cauldron/CauldronInteraction.java
++++ b/src/main/java/net/minecraft/core/cauldron/CauldronInteraction.java
+@@ -0,0 +0,0 @@ public interface CauldronInteraction {
+             } else {
+                 if (!world.isClientSide) {
+                     // CraftBukkit start
+-                    if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, Blocks.WATER_CAULDRON.defaultBlockState(), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY)) {
++                    if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, Blocks.WATER_CAULDRON.defaultBlockState(), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY, false)) { // Paper
+                         return InteractionResult.SUCCESS;
+                     }
+                     // CraftBukkit end
+@@ -0,0 +0,0 @@ public interface CauldronInteraction {
+             if ((Integer) iblockdata.getValue(LayeredCauldronBlock.LEVEL) != 3 && PotionUtils.getPotion(itemstack) == Potions.WATER) {
+                 if (!world.isClientSide) {
+                     // CraftBukkit start
+-                    if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, iblockdata.cycle(LayeredCauldronBlock.LEVEL), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY)) {
++                    if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, iblockdata.cycle(LayeredCauldronBlock.LEVEL), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY, false)) { // Paper
+                         return InteractionResult.SUCCESS;
+                     }
+                     // CraftBukkit end
+@@ -0,0 +0,0 @@ public interface CauldronInteraction {
+         } else {
+             if (!world.isClientSide) {
+                 // CraftBukkit start
+-                if (!LayeredCauldronBlock.changeLevel(state, world, pos, Blocks.CAULDRON.defaultBlockState(), player, CauldronLevelChangeEvent.ChangeReason.BUCKET_FILL)) {
++                if (!LayeredCauldronBlock.changeLevel(state, world, pos, Blocks.CAULDRON.defaultBlockState(), player, CauldronLevelChangeEvent.ChangeReason.BUCKET_FILL, false)) { // Paper
+                     return InteractionResult.SUCCESS;
+                 }
+                 // CraftBukkit end
+@@ -0,0 +0,0 @@ public interface CauldronInteraction {
+     static InteractionResult emptyBucket(Level world, BlockPos pos, Player player, InteractionHand hand, ItemStack stack, BlockState state, SoundEvent soundEvent) {
+         if (!world.isClientSide) {
+             // CraftBukkit start
+-            if (!LayeredCauldronBlock.changeLevel(state, world, pos, state, player, CauldronLevelChangeEvent.ChangeReason.BUCKET_EMPTY)) {
++            if (!LayeredCauldronBlock.changeLevel(state, world, pos, state, player, CauldronLevelChangeEvent.ChangeReason.BUCKET_EMPTY, false)) { // Paper
+                 return InteractionResult.SUCCESS;
+             }
+             // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/level/block/CauldronBlock.java b/src/main/java/net/minecraft/world/level/block/CauldronBlock.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/block/CauldronBlock.java
diff --git a/patches/server/Fix-item-locations-dropped-from-campfires.patch b/patches/server/Fix-item-locations-dropped-from-campfires.patch
index e2c2851318..72b68d5023 100644
--- a/patches/server/Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/Fix-item-locations-dropped-from-campfires.patch
@@ -4,6 +4,7 @@ Date: Sat, 3 Oct 2020 20:32:25 -0500
 Subject: [PATCH] Fix item locations dropped from campfires
 
 Fixes #4259 by not flooring the blockposition among other weirdness
+Vanilla Issue: MC-267622
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
@@ -14,11 +15,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                          itemstack1 = CraftItemStack.asNMSCopy(result);
                          // CraftBukkit end
 -                        Containers.dropItemStack(world, (double) pos.getX(), (double) pos.getY(), (double) pos.getZ(), itemstack1);
-+                    // Paper start
-+                    net.minecraft.world.entity.item.ItemEntity droppedItem = new net.minecraft.world.entity.item.ItemEntity(world, pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, itemstack1.split(world.random.nextInt(21) + 10));
-+                    droppedItem.setDeltaMovement(world.random.nextGaussian() * 0.05D, world.random.nextGaussian() * 0.05D + 0.2D, world.random.nextGaussian() * 0.05D);
-+                    world.addFreshEntity(droppedItem);
-+                    // Paper end
++                        // Paper start
++                        double deviation = 0.05F * RandomSource.GAUSSIAN_SPREAD_FACTOR;
++                        while (!itemstack1.isEmpty()) {
++                            net.minecraft.world.entity.item.ItemEntity droppedItem = new net.minecraft.world.entity.item.ItemEntity(world, pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, itemstack1.split(world.random.nextInt(21) + 10));
++                            droppedItem.setDeltaMovement(world.random.triangle(0.0D, deviation), world.random.triangle(0.2D, deviation), world.random.triangle(0.0D, deviation));
++                            world.addFreshEntity(droppedItem);
++                        }
++                        // Paper end
                          campfire.items.set(i, ItemStack.EMPTY);
                          world.sendBlockUpdated(pos, state, state, 3);
                          world.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(state));