MC 1.14.1

This commit is contained in:
Zach Brown 2019-05-13 21:20:58 -05:00
parent 5e7cfaf718
commit d84080e6d1
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
278 changed files with 1269 additions and 1298 deletions

View file

@ -1,14 +1,14 @@
From f14a06e28d6591edd48b1b57a6709a8cf93112c4 Mon Sep 17 00:00:00 2001
From 3dc036320c5c47452a57756953fb08f509c98008 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 8f46899f..62b120ef 100644
index 940c643d..9f87f333 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1313,6 +1313,17 @@ public final class Bukkit {
@@ -1311,6 +1311,17 @@ public final class Bukkit {
return server.getEntity(uuid);
}
@ -27,10 +27,10 @@ index 8f46899f..62b120ef 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 0f9e5ba7..3912c434 100644
index c197e381..e1dfa92a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1098,6 +1098,16 @@ public interface Server extends PluginMessageRecipient {
@@ -1096,6 +1096,16 @@ public interface Server extends PluginMessageRecipient {
@Nullable
Entity getEntity(@NotNull UUID uuid);