mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
2f782a6652
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 CraftBukkit Changes:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
From c051c75ea0d65ca5671c2b0c1ecde776e9fcb2f3 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 418c638d31..2eaed1cd63 100644
|
|
--- a/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 {
|
|
super.tick();
|
|
boolean flag = this.l();
|
|
float f = this.getRadius();
|
|
+ // Paper start - fix MC-114618
|
|
+ if (f < 0.5F) {
|
|
+ this.die();
|
|
+ return;
|
|
+ }
|
|
+ // Paper end
|
|
|
|
if (this.world.isClientSide) {
|
|
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
|
|
|