Skip to content

Fix Instant Heal with high amplify cause negative values MC-266229 #13068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix Instant Heal with high amplify cause negative values MC-266229 #13068

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions paper-server/patches/sources/net/minecraft/world/effect/HealOrHarmMobEffect.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@
} else {
entity.hurtServer(level, entity.damageSources().magic(), 6 << amplifier);
}
@@ -28,9 +_,10 @@
@@ -28,11 +_,12 @@
public void applyInstantenousEffect(
ServerLevel level, @Nullable Entity source, @Nullable Entity indirectSource, LivingEntity entity, int amplifier, double health
) {
+ if (!new io.papermc.paper.event.entity.EntityEffectTickEvent(entity.getBukkitLivingEntity(), org.bukkit.craftbukkit.potion.CraftPotionEffectType.minecraftToBukkit(this), amplifier).callEvent()) { return; } // Paper - Add EntityEffectTickEvent
if (this.isHarm == entity.isInvertedHealAndHarm()) {
int i = (int)(health * (4 << amplifier) + 0.5);
- int i = (int)(health * (4 << amplifier) + 0.5);
- entity.heal(i);
+ int i = Math.max((int)(health * (4 << amplifier) + 0.5), 0); // Paper - avoid negative values for MC-266229
+ entity.heal(i, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.MAGIC); // CraftBukkit
} else {
int i = (int)(health * (6 << amplifier) + 0.5);
- int i = (int)(health * (6 << amplifier) + 0.5);
+ int i = Math.max((int)(health * (6 << amplifier) + 0.5), 0); // Paper - avoid negative values for MC-266229
if (source == null) {
entity.hurtServer(level, entity.damageSources().magic(), i);
} else {
Loading