Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 12:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
befcf86d SPIGOT-7740: Fix using new map cursor types
09229095 Add EntityDamageEvent.DamageCause#CAMPFIRE

CraftBukkit Changes:
a1d2cd152 SPIGOT-7747: Mob head is not dropped when mob was blown up by a charged creeper
8078294bc SPIGOT-7746: Server Crashing when Players Getting into End Portals
8d842e250 SPIGOT-7744: Fix exception for shooting projectiles with flame enchantment
64e0ad129 SPIGOT-7744: Fix crash when shooting arrows in creative mode
819f7a10a Fix player items not dropping on death
0a0229bb5 Implement DamageCause#CAMPFIRE and minor improvement in exception for Unhandled block damage
This commit is contained in:
Spottedleaf 2024-06-14 10:15:52 -07:00
parent 3f581a6024
commit e9068d28c6
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/Allow-to-define-new-map-cursor-types.patch
View File

@ -12,8 +12,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
*/ */
@Deprecated(forRemoval = true, since = "1.20.2") // Paper @Deprecated(forRemoval = true, since = "1.20.2") // Paper
public void setRawType(byte type) { public void setRawType(byte type) {
- if (type < 0 || type > 26) { - if (type < 0 || type > 34) {
- throw new IllegalArgumentException("Type must be in the range 0-26"); - throw new IllegalArgumentException("Type must be in the range 0-34");
+ if (type < 0 || type > Type.UPPER_MAP_CURSOR_TYPE_BOUND) { // Paper + 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 + throw new IllegalArgumentException("Type must be in the range 0-" + Type.UPPER_MAP_CURSOR_TYPE_BOUND); // Paper
} }

4
patches/api/Fix-Spigot-annotation-mistakes.patch
View File

@ -1702,8 +1702,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- @Deprecated - @Deprecated
+ @Deprecated(forRemoval = true, since = "1.20.2") // Paper + @Deprecated(forRemoval = true, since = "1.20.2") // Paper
public void setRawType(byte type) { public void setRawType(byte type) {
if (type < 0 || type > 26) { if (type < 0 || type > 34) {
throw new IllegalArgumentException("Type must be in the range 0-26"); throw new IllegalArgumentException("Type must be in the range 0-34");
@@ -0,0 +0,0 @@ public final class MapCursor { @@ -0,0 +0,0 @@ public final class MapCursor {
* Gets the internal value of the cursor. * Gets the internal value of the cursor.
* *

2
patches/server/Fix-DamageSource-API.patch
View File

@ -114,7 +114,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
if (!event.isCancelled()) { if (!event.isCancelled()) {
// CraftBukkit end // CraftBukkit end
this.dead = true; 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.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.spawnLingeringCloud();
this.triggerOnDeathMobEffects(Entity.RemovalReason.KILLED); this.triggerOnDeathMobEffects(Entity.RemovalReason.KILLED);

2
patches/server/Restore-vanilla-entity-drops-behavior.patch
View File

@ -22,7 +22,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
if (!keepInventory) { if (!keepInventory) {
for (ItemStack item : this.getInventory().getContents()) { 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(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) + 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)
} }

2
work/Bukkit

@ -1 +1 @@
Subproject commit b0a1d5b74806be6c64ac48b16fa91b3667fe7541 Subproject commit befcf86d22f9576c361bba18b2ec725e41508a65

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit a4c2ee70db50ade62436c7eaf6ec1f5376dce192 Subproject commit a1d2cd1521b97cb4048f990455d78e7c9fb94e82