diff options
| author | Zach Brown <[email protected]> | 2019-06-02 21:49:14 -0500 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2019-06-02 21:49:14 -0500 |
| commit | 268b076ab20904075956416157b2386ebe00227b (patch) | |
| tree | 151a2d8ee82e123f7d40183f8286db9b08dda2bd | |
| parent | 217a746e1d9e92589ec70fc95ede8a0bebbe4d80 (diff) | |
| download | Paper-268b076ab20904075956416157b2386ebe00227b.tar.gz Paper-268b076ab20904075956416157b2386ebe00227b.zip | |
Backport MC-114618 - EntityAreaEffectCloud negative size fix
| -rw-r--r-- | Spigot-Server-Patches/0441-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0441-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0441-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch new file mode 100644 index 0000000000..f21b30969b --- /dev/null +++ b/Spigot-Server-Patches/0441-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch @@ -0,0 +1,43 @@ +From 2574fc84c5d9bfa168cb11c47bdc30a7d73f3696 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath <[email protected]> +Date: Sun, 2 Jun 2019 21:12:42 -0500 +Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative + + +diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java +index b2814c0e..13d749af 100644 +--- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java ++++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java +@@ -158,6 +158,12 @@ public class EntityAreaEffectCloud extends Entity { + super.tick(); + boolean flag = this.l(); + float f = this.getRadius(); ++ // Paper start - fix MC-114618 ++ if (f < 0.5F) { ++ this.die(); ++ return; ++ } ++ // Paper end + + if (this.world.isClientSide) { + ParticleParam particleparam = this.getParticle(); +@@ -227,10 +233,12 @@ public class EntityAreaEffectCloud extends Entity { + + if (this.radiusPerTick != 0.0F) { + f += this.radiusPerTick; +- if (f < 0.5F) { +- this.die(); +- return; +- } ++ // Paper start - moved up - fix MC-114618 ++ //if (f < 0.5F) { ++ // this.die(); ++ // return; ++ //} ++ // Paper end + + this.setRadius(f); + } +-- +2.21.0 + |