mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB

Browse source
This commit is contained in:
Zach Brown 2016-11-21 15:51:27 -06:00
parent eb877d8cdb
commit 97e0eac6e7
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
21 changed files with 79 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Spigot-API-Patches/0003-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 30dc07b0d34561883d0c878ff8ad5f9b70c98cb2 Mon Sep 17 00:00:00 2001
From d01fb3a2f5dbe0d60e5d7bfd25c16a040df5315e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2
@ -2888,10 +2888,10 @@ index 0000000..3a288d2
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 5d8422e..ac8b0f5 100644
index 07b44eb..07530ff 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -537,7 +537,6 @@ public final class Bukkit {
@@ -538,7 +538,6 @@ public final class Bukkit {
*/
public static void reload() {
server.reload();
@ -2900,10 +2900,10 @@ index 5d8422e..ac8b0f5 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c5c3506..3cc741b 100644
index 2a9c860..36d0be2 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -925,12 +925,27 @@ public interface Server extends PluginMessageRecipient {
@@ -935,12 +935,27 @@ public interface Server extends PluginMessageRecipient {
public class Spigot
{