mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +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
43 lines
1 KiB
Diff
43 lines
1 KiB
Diff
From 8a5ed8af917559e92ff5030c6060dcc713070b06 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 6 Oct 2018 21:47:09 -0500
|
|
Subject: [PATCH] Allow setting the vex's summoner
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java
|
|
index 6b61c4ab7..c34a3ea7b 100644
|
|
--- a/src/main/java/org/bukkit/entity/Vex.java
|
|
+++ b/src/main/java/org/bukkit/entity/Vex.java
|
|
@@ -1,5 +1,7 @@
|
|
package org.bukkit.entity;
|
|
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
/**
|
|
* Represents a Vex.
|
|
*/
|
|
@@ -22,4 +24,21 @@ public interface Vex extends Monster {
|
|
* @param charging new state
|
|
*/
|
|
void setCharging(boolean charging);
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Get the Mob that summoned this vex
|
|
+ *
|
|
+ * @return Mob that summoned this vex
|
|
+ */
|
|
+ @Nullable
|
|
+ Mob getSummoner();
|
|
+
|
|
+ /**
|
|
+ * Set the summoner of this vex
|
|
+ *
|
|
+ * @param summoner New summoner
|
|
+ */
|
|
+ void setSummoner(@Nullable Mob summoner);
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.21.0
|
|
|