mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
57dd397155
Upstream has released updates that appears 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: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes:77fd87e4SPIGOT-2304: Implement LootGenerateEventa1a705eeSPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712eddSPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
28 lines
989 B
Diff
28 lines
989 B
Diff
From b534976a471b308f55d533a4d9b8a4196af985f1 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 e8f3e55fd3..44289c2301 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
|
|
@@ -175,6 +175,12 @@ public class EntityAreaEffectCloud extends Entity {
|
|
super.tick();
|
|
boolean flag = this.l();
|
|
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();
|
|
--
|
|
2.26.2
|
|
|