Update Paper to MC 1.11
This commit is contained in:
parent
6c1880847f
commit
a6d146a939
193 changed files with 1635 additions and 1846 deletions
|
@ -1,14 +1,14 @@
|
|||
From 5c2caa3ee27bbd84914df4a001cfb7bcb528b3a2 Mon Sep 17 00:00:00 2001
|
||||
From 10486c5a17f63eecf703a772acd168b74c0f6d40 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 85fd9a8..8d602a3 100644
|
||||
index ac8b0f5..86102a6 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1140,6 +1140,14 @@ public final class Bukkit {
|
||||
@@ -1121,6 +1121,14 @@ public final class Bukkit {
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -24,10 +24,10 @@ index 85fd9a8..8d602a3 100644
|
|||
* @return the unsafe values instance
|
||||
*/
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index f82cbaf..6e23b0c 100644
|
||||
index 3cc741b..1e65835 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -934,6 +934,13 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -917,6 +917,13 @@ public interface Server extends PluginMessageRecipient {
|
||||
BossBar createBossBar(String title, BarColor color, BarStyle style, BarFlag ...flags);
|
||||
|
||||
/**
|
||||
|
@ -42,5 +42,5 @@ index f82cbaf..6e23b0c 100644
|
|||
* @return the unsafe values instance
|
||||
*/
|
||||
--
|
||||
2.9.2.windows.1
|
||||
2.10.2
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue