Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@70f253f3 Update ItemType
PaperMC/Paper@774a32e8 sulfur cube archetype registry
PaperMC/Paper@f2ebae60 update legacy ItemType generic type
PaperMC/Paper@93feb440 deprecate PigZapEvent
PaperMC/Paper@73725c6b update to pre-5
PaperMC/Paper@5357d03b fix serialization error when creating empty flat world
PaperMC/Paper@620da256 expand CreeperIgniteEvent to cover minecart tnt and sulfur cube
This commit is contained in:
granny
2026-06-08 12:17:33 -07:00
parent 148c8551bd
commit c94a2c9b86
10 changed files with 38 additions and 38 deletions

View File

@@ -40,7 +40,7 @@
@Nullable
public Entity eventEntityDamager() {
return this.eventEntityDamager;
@@ -94,6 +_,8 @@
@@ -98,6 +_,8 @@
damageSource.eventBlockDamager = this.eventBlockDamager;
damageSource.fromBlockSnapshot = this.fromBlockSnapshot;
damageSource.critical = this.critical;
@@ -49,7 +49,7 @@
return damageSource;
}
// CraftBukkit end
@@ -159,11 +_,20 @@
@@ -163,11 +_,20 @@
} else {
Component name = this.causingEntity == null ? this.directEntity.getDisplayName() : this.causingEntity.getDisplayName();
ItemStack held = this.causingEntity instanceof LivingEntity livingEntity ? livingEntity.getMainHandItem() : ItemStack.EMPTY;

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -964,6 +_,7 @@
@@ -967,6 +_,7 @@
@Override
protected boolean canRide(final Entity vehicle) {
@@ -8,7 +8,7 @@
return false;
}
@@ -999,7 +_,7 @@
@@ -1002,7 +_,7 @@
boolean shouldDrop = level.getGameRules().get(GameRules.MOB_DROPS);
int xpCount = 500;