Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
45 Zeilen
1.5 KiB
Diff
45 Zeilen
1.5 KiB
Diff
From 7e81c4e0469c1a263e792dd5657bae9e9d9f6e0e 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
|
|
|