Update upstream B/CB/Spigot and rebuild
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 115a69756eb8f99a16be4b602e75edce84128684 Mon Sep 17 00:00:00 2001
|
||||
From ffc094f33f81e73c7067ef740dc22183e4553369 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
|
||||
@@ -3160,10 +3160,10 @@ index fc59aa3..0000000
|
||||
- // Spigot end
|
||||
-}
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 649cd45..3242c69 100644
|
||||
index 8e38006..19f7ae7 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1356,6 +1356,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1360,6 +1360,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
|
||||
throw new UnsupportedOperationException("Not supported yet.");
|
||||
}
|
||||
@@ -3538,5 +3538,5 @@ index 8d98297..7e89b97 100644
|
||||
- }
|
||||
}
|
||||
--
|
||||
2.7.1.windows.2
|
||||
2.7.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user