Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update upstream B/CB/S

Browse Source 
--- work/Bukkit
Submodule work/Bukkit 1627782b..67e91ef7:
  > Fix some incorrectly handled JavaDoc
  > SPIGOT-4478: Update PlayerLoginEvent docs
  > Add API to manipulate boss bar of entities and those created by commands

--- work/CraftBukkit
Submodule work/CraftBukkit ca22de36..3a911828:
  > SPIGOT-4477: Arrows only firing direction of boat
  > SPIGOT-4478: NPE during PlayerLoginEvent recipe manipulation
  > Add API to manipulate boss bar of entities and those created by commands

--- work/Spigot
Submodule work/Spigot 2474d93d..947a8e7f:
  > Rebuild patches
This commit is contained in:
Zach Brown
2018-11-11 00:37:15 -05:00
parent 8b8e15fb63
commit dcebe229b5
45 changed files with 359 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-API-Patches/0005-Add-getTPS-method.patch
View File

@@ -1,14 +1,14 @@
From 76511263884d3cda914b6672710ece89277ab42b Mon Sep 17 00:00:00 2001
From 54b68ef1792c46a500d9e0ece68e0c42ef4d1b90 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 242c6fba..c7bb73e6 100644
index 7fdd1a08..a20c7b73 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1195,6 +1195,16 @@ public final class Bukkit {
@@ -1270,6 +1270,16 @@ public final class Bukkit {
return server.getEntity(uuid);
}
@@ -26,10 +26,10 @@ index 242c6fba..c7bb73e6 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 33934411..ddfd2219 100644
index 0e7a81c8..6e8b1380 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -985,6 +985,15 @@ public interface Server extends PluginMessageRecipient {
@@ -1052,6 +1052,15 @@ public interface Server extends PluginMessageRecipient {
*/
Entity getEntity(UUID uuid);
@@ -46,5 +46,5 @@ index 33934411..ddfd2219 100644
* Get the advancement specified by this key.
*
--
2.19.0
2.19.1