Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 20:46:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2223 from BillyGalbreath/ver/1.14

Browse Source 
Rework fix for MC-114618 so not break map maker's workflow. Fixes #2221
This commit is contained in:
kashike 2019-06-23 13:39:54 -07:00 committed by GitHub
commit 94deeb6dcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Spigot-Server-Patches/0396-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
View File

@ -1,4 +1,4 @@
From 7e81c4e0469c1a263e792dd5657bae9e9d9f6e0e Mon Sep 17 00:00:00 2001 From 74a90e209f5e47e996f4f6441a873acbadebfd10 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 27 May 2019 17:35:39 -0500 Date: Mon, 27 May 2019 17:35:39 -0500
Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
@ -6,7 +6,7 @@ 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 diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
index 418c638d31..2eaed1cd63 100644 index 418c638d3..315ba7a22 100644
--- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
+++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
@@ -163,6 +163,12 @@ public class EntityAreaEffectCloud extends Entity { @@ -163,6 +163,12 @@ public class EntityAreaEffectCloud extends Entity {
@ -14,7 +14,7 @@ index 418c638d31..2eaed1cd63 100644
boolean flag = this.l(); boolean flag = this.l();
float f = this.getRadius(); float f = this.getRadius();
+ // Paper start - fix MC-114618 + // Paper start - fix MC-114618
+ if (f < 0.5F) { + if (f < 0.0F) {
+ this.die(); + this.die();
+ return; + return;
+ } + }
@ -22,23 +22,6 @@ index 418c638d31..2eaed1cd63 100644
if (this.world.isClientSide) { if (this.world.isClientSide) {
ParticleParam particleparam = this.getParticle(); ParticleParam particleparam = this.getParticle();
@@ -232,10 +238,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.20.1