diff --git a/patches/api/Allow-to-define-new-map-cursor-types.patch b/patches/api/Allow-to-define-new-map-cursor-types.patch index 19a9239398..31286c39f1 100644 --- a/patches/api/Allow-to-define-new-map-cursor-types.patch +++ b/patches/api/Allow-to-define-new-map-cursor-types.patch @@ -12,8 +12,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 */ @Deprecated(forRemoval = true, since = "1.20.2") // Paper public void setRawType(byte type) { -- if (type < 0 || type > 26) { -- throw new IllegalArgumentException("Type must be in the range 0-26"); +- if (type < 0 || type > 34) { +- throw new IllegalArgumentException("Type must be in the range 0-34"); + if (type < 0 || type > Type.UPPER_MAP_CURSOR_TYPE_BOUND) { // Paper + throw new IllegalArgumentException("Type must be in the range 0-" + Type.UPPER_MAP_CURSOR_TYPE_BOUND); // Paper } diff --git a/patches/api/Fix-Spigot-annotation-mistakes.patch b/patches/api/Fix-Spigot-annotation-mistakes.patch index a5a5068c6c..b82cc3cf1d 100644 --- a/patches/api/Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/Fix-Spigot-annotation-mistakes.patch @@ -1702,8 +1702,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - @Deprecated + @Deprecated(forRemoval = true, since = "1.20.2") // Paper public void setRawType(byte type) { - if (type < 0 || type > 26) { - throw new IllegalArgumentException("Type must be in the range 0-26"); + if (type < 0 || type > 34) { + throw new IllegalArgumentException("Type must be in the range 0-34"); @@ -0,0 +0,0 @@ public final class MapCursor { * Gets the internal value of the cursor. * diff --git a/patches/server/Fix-DamageSource-API.patch b/patches/server/Fix-DamageSource-API.patch index 91afbd4fef..9858ad6efd 100644 --- a/patches/server/Fix-DamageSource-API.patch +++ b/patches/server/Fix-DamageSource-API.patch @@ -114,7 +114,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (!event.isCancelled()) { // CraftBukkit end this.dead = true; -- this.level().explode(this, this.level().damageSources().explosion(this, this.entityIgniter, net.minecraft.world.damagesource.DamageTypes.EXPLOSION), null, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); // CraftBukkit +- this.level().explode(this, net.minecraft.world.level.Explosion.getDefaultDamageSource(this.level(), this).customEntityDamager(this.entityIgniter), null, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); // CraftBukkit + this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); // CraftBukkit // Paper - fix DamageSource API (revert to vanilla, no, just no, don't change this) this.spawnLingeringCloud(); this.triggerOnDeathMobEffects(Entity.RemovalReason.KILLED); diff --git a/patches/server/Restore-vanilla-entity-drops-behavior.patch b/patches/server/Restore-vanilla-entity-drops-behavior.patch index 73e7ff1a12..36e87eb8a0 100644 --- a/patches/server/Restore-vanilla-entity-drops-behavior.patch +++ b/patches/server/Restore-vanilla-entity-drops-behavior.patch @@ -22,7 +22,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (!keepInventory) { for (ItemStack item : this.getInventory().getContents()) { - if (!item.isEmpty() && EnchantmentHelper.has(item, EnchantmentEffectComponents.PREVENT_EQUIPMENT_DROP)) { + if (!item.isEmpty() && !EnchantmentHelper.has(item, EnchantmentEffectComponents.PREVENT_EQUIPMENT_DROP)) { - loot.add(CraftItemStack.asCraftMirror(item)); + loot.add(new DefaultDrop(item, stack -> this.drop(stack, true, false, false))); // Paper - Restore vanilla drops behavior; drop function taken from Inventory#dropAll (don't fire drop event) } diff --git a/work/Bukkit b/work/Bukkit index b0a1d5b748..befcf86d22 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit b0a1d5b74806be6c64ac48b16fa91b3667fe7541 +Subproject commit befcf86d22f9576c361bba18b2ec725e41508a65 diff --git a/work/CraftBukkit b/work/CraftBukkit index a4c2ee70db..a1d2cd1521 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit a4c2ee70db50ade62436c7eaf6ec1f5376dce192 +Subproject commit a1d2cd1521b97cb4048f990455d78e7c9fb94e82