diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch index 84f2d631..1344b4b6 100644 --- a/patches/api/0002-Purpur-API-Changes.patch +++ b/patches/api/0002-Purpur-API-Changes.patch @@ -3,7 +3,7 @@ From: Github Actions Date: Fri, 16 Jun 2023 05:21:52 +0000 Subject: [PATCH] Purpur API Changes -Commit: 042e192444ecc577c172710e3dab1d38413b1ea2 +Commit: fbedef8a1618a8d61d787b50a8acc752e3e2ca4c Patches below are removed in this patch: Build-System-Changes.patch diff --git a/patches/server/0009-Purpur-Server-Changes.patch b/patches/server/0009-Purpur-Server-Changes.patch index 9eb7699c..a07c9649 100644 --- a/patches/server/0009-Purpur-Server-Changes.patch +++ b/patches/server/0009-Purpur-Server-Changes.patch @@ -3,7 +3,7 @@ From: Github Actions Date: Wed, 24 May 2023 06:00:03 +0800 Subject: [PATCH] Purpur Server Changes -Commit: 042e192444ecc577c172710e3dab1d38413b1ea2 +Commit: fbedef8a1618a8d61d787b50a8acc752e3e2ca4c Patches below are removed in this patch: MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch @@ -24,6 +24,7 @@ MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch Fix-MC-123848.patch Spark-Profiler.patch Halloween-options-and-optimizations.patch +temporarily-revert-PaperMC-Paper-eb60bff.patch Original license: MIT Original project: https://github.com/PurpurMC/Purpur @@ -8684,7 +8685,7 @@ index 0f4ef103afcbabc04880c8fc3547b861341c15fc..4b3a8e4a084585d56dd10a08405463b1 } diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -index 2639acd2c16c178ac134dd04e0cdc83dad1aa1d6..30295f15b7f7f95058878231529102f91203ba58 100644 +index 2639acd2c16c178ac134dd04e0cdc83dad1aa1d6..3ff5c2a4a2cca5c9a89ceafd9fddeb1012344433 100644 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java @@ -58,6 +58,12 @@ public class ItemEntity extends Entity implements TraceableEntity { @@ -8700,22 +8701,24 @@ index 2639acd2c16c178ac134dd04e0cdc83dad1aa1d6..30295f15b7f7f95058878231529102f9 public ItemEntity(EntityType type, Level world) { super(type, world); -@@ -380,6 +386,15 @@ public class ItemEntity extends Entity implements TraceableEntity { - return false; - } else if (!this.getItem().getItem().canBeHurtBy(source)) { - return false; +@@ -374,7 +380,16 @@ public class ItemEntity extends Entity implements TraceableEntity { + + @Override + public boolean hurt(DamageSource source, float amount) { +- if (this.isInvulnerableTo(source)) { + // Purpur start -+ } else if ( ++ if ( + (immuneToCactus && source.is(net.minecraft.world.damagesource.DamageTypes.CACTUS)) || -+ (immuneToFire && (source.is(DamageTypeTags.IS_FIRE) && source.is(net.minecraft.world.damagesource.DamageTypes.IN_FIRE)) || -+ (immuneToLightning && source.is(net.minecraft.world.damagesource.DamageTypes.LIGHTNING_BOLT)) || -+ (immuneToExplosion && source.is(DamageTypeTags.IS_EXPLOSION))) ++ (immuneToFire && (source.is(DamageTypeTags.IS_FIRE) || source.is(net.minecraft.world.damagesource.DamageTypes.ON_FIRE) || source.is(net.minecraft.world.damagesource.DamageTypes.IN_FIRE))) || ++ (immuneToLightning && source.is(net.minecraft.world.damagesource.DamageTypes.LIGHTNING_BOLT)) || ++ (immuneToExplosion && source.is(DamageTypeTags.IS_EXPLOSION)) + ) { + return false; -+ // Purpur end - } else if (this.level().isClientSide) { - return true; - } else { ++ } else if (this.isInvulnerableTo(source)) { ++ // Purpur end + return false; + } else if (!this.getItem().isEmpty() && this.getItem().is(Items.NETHER_STAR) && source.is(DamageTypeTags.IS_EXPLOSION)) { + return false; @@ -577,6 +592,12 @@ public class ItemEntity extends Entity implements TraceableEntity { // com.google.common.base.Preconditions.checkArgument(!stack.isEmpty(), "Cannot drop air"); // CraftBukkit // Paper - Remove check this.getEntityData().set(ItemEntity.DATA_ITEM, stack);