diff --git a/patches/server/Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/Fix-a-bunch-of-vanilla-bugs.patch index 359af9f57..79d188cae 100644 --- a/patches/server/Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/Fix-a-bunch-of-vanilla-bugs.patch @@ -40,6 +40,10 @@ https://bugs.mojang.com/browse/MC-257875 by: Jake Potrebic Fixes server not consuming fire charges when igniting a creeper +https://bugs.mojang.com/browse/MC-258535 + by: Jake Potrebic + Fixes certain explosion damage not scaling with difficulty + Co-authored-by: William Blake Galbreath Co-authored-by: MelnCat @@ -82,6 +86,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } } +diff --git a/src/main/java/net/minecraft/world/damagesource/EntityDamageSource.java b/src/main/java/net/minecraft/world/damagesource/EntityDamageSource.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/world/damagesource/EntityDamageSource.java ++++ b/src/main/java/net/minecraft/world/damagesource/EntityDamageSource.java +@@ -0,0 +0,0 @@ public class EntityDamageSource extends DamageSource { + + @Override + public boolean scalesWithDifficulty() { +- return this.entity instanceof LivingEntity && !(this.entity instanceof Player); ++ return super.scalesWithDifficulty() || this.entity instanceof LivingEntity && !(this.entity instanceof Player); // Paper - fix MC-258535 - respect the scalesWithDifficulty override + } + + @Nullable diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java