Updated Upstream (Bukkit/CraftBukkit/Spigot)
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: 6148fca7 SPIGOT-5484: Add more spawn tick settings CraftBukkit Changes: fc249340 SPIGOT-5484: Add more spawn tick settings Spigot Changes: 6de3d4be Rebuild patches
This commit is contained in:
parent
2e44dc1ae3
commit
b16fd5c3a3
72 changed files with 421 additions and 421 deletions
|
@ -1,14 +1,14 @@
|
|||
From e4691bd2dccf7c9841bb40ec8aa4ee86fc6f81b7 Mon Sep 17 00:00:00 2001
|
||||
From b8c5b1d14ba84e8fb7b5dc2dbd7058d46f0a359a 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 3faccfea7..c9f473641 100644
|
||||
index 6c3aa4185..6b951d5ad 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1499,6 +1499,19 @@ public final class Bukkit {
|
||||
@@ -1543,6 +1543,19 @@ public final class Bukkit {
|
||||
return server.getUnsafe();
|
||||
}
|
||||
|
||||
|
@ -29,10 +29,10 @@ index 3faccfea7..c9f473641 100644
|
|||
public static Server.Spigot spigot() {
|
||||
return server.spigot();
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 51efc5f71..121367cd0 100644
|
||||
index f0dba56dc..af21bb1aa 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1118,6 +1118,15 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1158,6 +1158,15 @@ public interface Server extends PluginMessageRecipient {
|
||||
public double[] getTPS();
|
||||
// Paper end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue