mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 20:46:59 +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
54 lines
1.4 KiB
Diff
54 lines
1.4 KiB
Diff
From 1609f1dd56d9b507e3e9b35dd4cfb2b402af24fc Mon Sep 17 00:00:00 2001
|
|
From: kashike <kashike@vq.lc>
|
|
Date: Mon, 29 Feb 2016 19:48:59 -0600
|
|
Subject: [PATCH] Expose server CommandMap
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 9f87f333e..63e48ef3f 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1485,6 +1485,19 @@ public final class Bukkit {
|
|
return server.getUnsafe();
|
|
}
|
|
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the active {@link org.bukkit.command.CommandMap}
|
|
+ *
|
|
+ * @return the active command map
|
|
+ */
|
|
+ @NotNull
|
|
+ public static org.bukkit.command.CommandMap getCommandMap() {
|
|
+ return server.getCommandMap();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@NotNull
|
|
public static Server.Spigot spigot()
|
|
{
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index e1dfa92a9..87300a5df 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1106,6 +1106,15 @@ public interface Server extends PluginMessageRecipient {
|
|
public double[] getTPS();
|
|
// Paper end
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the active {@link org.bukkit.command.CommandMap}
|
|
+ *
|
|
+ * @return the active command map
|
|
+ */
|
|
+ @NotNull
|
|
+ org.bukkit.command.CommandMap getCommandMap();
|
|
+
|
|
/**
|
|
* Get the advancement specified by this key.
|
|
*
|
|
--
|
|
2.21.0
|
|
|