mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 12:41:50 +01:00
b31089a929
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: d264e972 #591: Add option for a consumer before spawning an item 1c537fce #590: Add spawn and transform reasons for piglin zombification. CraftBukkit Changes: ee5006d1 #810: Add option for a consumer before spawning an item f6a39d3c #809: Add spawn and transform reasons for piglin zombification. 0c24068a Organise imports Spigot Changes: bff52619 Organise imports
24 lines
1 KiB
Diff
24 lines
1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Mon, 27 May 2019 17:35:39 -0500
|
|
Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
|
|
size
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
|
|
index 6955fe7f7728987553d2a86fe3966deb5eea077d..35fb12c23bf46d3211ae5756fd604196bdc16da5 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
|
|
@@ -176,6 +176,12 @@ public class EntityAreaEffectCloud extends Entity {
|
|
super.tick();
|
|
boolean flag = this.k();
|
|
float f = this.getRadius();
|
|
+ // Paper start - fix MC-114618
|
|
+ if (f < 0.0F) {
|
|
+ this.die();
|
|
+ return;
|
|
+ }
|
|
+ // Paper end
|
|
|
|
if (this.world.isClientSide) {
|
|
ParticleParam particleparam = this.getParticle();
|