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

Update upstream B/CB

Browse source 
Closes GH-569
This commit is contained in:
Zach Brown 2017-01-06 15:45:59 -06:00
parent 849653ebac
commit 63130fd2aa
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
140 changed files with 381 additions and 544 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From db5fdbf9e4aa5d4ae6de2c73e045656da6d057ed Mon Sep 17 00:00:00 2001
From 814a2afee3c6dd679eda99f04850f658b9a947e3 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,7 +2888,7 @@ index 0000000..3a288d2
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 07b44eb..07530ff 100644
index 5b6413b..7fd544e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -538,7 +538,6 @@ public final class Bukkit {
@ -2900,10 +2900,10 @@ index 07b44eb..07530ff 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 2a9c860..36d0be2 100644
index 120dba2..77cfe56 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -935,12 +935,27 @@ public interface Server extends PluginMessageRecipient {
@@ -943,12 +943,27 @@ public interface Server extends PluginMessageRecipient {
public class Spigot
{
@ -3278,10 +3278,10 @@ index a8f61f2..0000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 6299843..64c35df 100644
index 5a2dc32..5fbad9f 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1455,6 +1455,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1443,6 +1443,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}