mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 02:55:47 +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
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
From 6920434f57d65bdcb36d94c4c347c5e30f3775ad Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 28 Dec 2016 01:18:55 -0500
|
|
Subject: [PATCH] Fireworks API's
|
|
|
|
Get the Entity being boosted
|
|
Get the firework launcher
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java
|
|
index 1c55f0338..7df26cf7f 100644
|
|
--- a/src/main/java/org/bukkit/entity/Firework.java
|
|
+++ b/src/main/java/org/bukkit/entity/Firework.java
|
|
@@ -3,6 +3,9 @@ package org.bukkit.entity;
|
|
import org.bukkit.inventory.meta.FireworkMeta;
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
|
+import java.util.UUID;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
public interface Firework extends Entity {
|
|
|
|
/**
|
|
@@ -25,4 +28,15 @@ public interface Firework extends Entity {
|
|
* remaining fuse.
|
|
*/
|
|
void detonate();
|
|
+
|
|
+ // Paper start
|
|
+ @Nullable
|
|
+ public UUID getSpawningEntity();
|
|
+ /**
|
|
+ * If this firework is boosting an entity, return it
|
|
+ * @return The entity being boosted
|
|
+ */
|
|
+ @Nullable
|
|
+ public LivingEntity getBoostedEntity();
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.21.0
|
|
|