diff options
| author | William Blake Galbreath <[email protected]> | 2019-06-24 20:40:43 -0500 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2019-06-24 20:40:43 -0500 |
| commit | 1b59bbbc7ce8dd13499a3d2082afe2bc1a7a9433 (patch) | |
| tree | 6702bd574a8dce7efe8961f2c1e5b1e15edb9c2e | |
| parent | 725081bb9509c7860344569a4a1e41a8b6129129 (diff) | |
| download | Paper-1b59bbbc7ce8dd13499a3d2082afe2bc1a7a9433.tar.gz Paper-1b59bbbc7ce8dd13499a3d2082afe2bc1a7a9433.zip | |
Rework fix for MC-114618 so not break map maker's workflow. Fixes #2221
| -rw-r--r-- | Spigot-Server-Patches/0441-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch | 25 |
1 files changed, 4 insertions, 21 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 index f21b30969b..915853b61e 100644 --- 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 @@ -1,11 +1,11 @@ -From 2574fc84c5d9bfa168cb11c47bdc30a7d73f3696 Mon Sep 17 00:00:00 2001 +From 4188d3f20337cc303e6ea5245cf4cdbd7e5ffd3c 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 +index b2814c0e..033182ae 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 { @@ -13,7 +13,7 @@ index b2814c0e..13d749af 100644 boolean flag = this.l(); float f = this.getRadius(); + // Paper start - fix MC-114618 -+ if (f < 0.5F) { ++ if (f < 0.0F) { + this.die(); + return; + } @@ -21,23 +21,6 @@ index b2814c0e..13d749af 100644 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 +2.22.0 |