twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-16 04:33:56 -07:00
Code Issues Packages 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:
Riley Park
2019-06-23 13:39:54 -07:00
parent f34c1b5fe2 347defbe7a
commit 12c7569092
1 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
@@ -0,0 +0,0 @@ public class EntityAreaEffectCloud extends Entity { @@ -0,0 +0,0 @@ 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,21 +22,4 @@ index 418c638d31..2eaed1cd63 100644
if (this.world.isClientSide) { if (this.world.isClientSide) {
ParticleParam particleparam = this.getParticle(); ParticleParam particleparam = this.getParticle();
@@ -0,0 +0,0 @@ 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);
}
-- --