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 9a5fb9b80a46a450067b0620831174013dd92ad1 Mon Sep 17 00:00:00 2001
|
||||
From 627f5e579e6923c6f7297db05160264f9dfa66f5 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 29 Feb 2016 17:24:57 -0600
|
||||
Subject: [PATCH] Add getTPS method
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 279236a45..3faccfea7 100644
|
||||
index 755869366..6c3aa4185 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1325,6 +1325,17 @@ public final class Bukkit {
|
||||
@@ -1369,6 +1369,17 @@ public final class Bukkit {
|
||||
return server.getEntity(uuid);
|
||||
}
|
||||
|
||||
|
@ -27,10 +27,10 @@ index 279236a45..3faccfea7 100644
|
|||
* Get the advancement specified by this key.
|
||||
*
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index d00a289de..51efc5f71 100644
|
||||
index fad4e9292..f0dba56dc 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1108,6 +1108,16 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1148,6 +1148,16 @@ public interface Server extends PluginMessageRecipient {
|
||||
@Nullable
|
||||
Entity getEntity(@NotNull UUID uuid);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue