diff options
| author | Zach Brown <[email protected]> | 2019-07-14 13:37:14 -0500 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2019-07-14 13:37:14 -0500 |
| commit | 77cce8236ff09d52730b66c7a146265ce3415185 (patch) | |
| tree | 69b8a4a1158d844cf731f0e203deab3c0cd4666e | |
| parent | 33d42c8e7d6aaad733d7badb118c2a3e63be5908 (diff) | |
| download | Paper-77cce8236ff09d52730b66c7a146265ce3415185.tar.gz Paper-77cce8236ff09d52730b66c7a146265ce3415185.zip | |
Backport map maker workflow fix for #2221
| -rw-r--r-- | Spigot-Server-Patches/0383-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/Spigot-Server-Patches/0383-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0383-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch index affb67bc23..573617286b 100644 --- a/Spigot-Server-Patches/0383-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch +++ b/Spigot-Server-Patches/0383-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch @@ -1,11 +1,11 @@ -From 14567b0450b943b00f8a36375b813f5efd73f4d8 Mon Sep 17 00:00:00 2001 +From b2d8b2c49ad9f2ba6155e0d668c9dab0e446138c 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 ec579e7f1..9e5da2a0f 100644 +index ec579e7f..836d368b 100644 --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java @@ -174,6 +174,12 @@ public class EntityAreaEffectCloud extends Entity { @@ -13,7 +13,7 @@ index ec579e7f1..9e5da2a0f 100644 boolean flag = this.q(); 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 ec579e7f1..9e5da2a0f 100644 if (this.world.isClientSide) { EnumParticle enumparticle = this.getParticle(); -@@ -253,10 +259,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 |