Update upstreams

This commit is contained in:
Zach Brown 2016-04-11 10:30:12 -05:00
parent a0d38c0b55
commit ef3f6a481a
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
4 changed files with 9 additions and 9 deletions

View file

@ -1,4 +1,4 @@
From 0ec92e17d7012a63b718d6c7d816d45b4fd2a4f4 Mon Sep 17 00:00:00 2001
From c6ee4d00002d40f7052f63322b805dfd5aaeaaf7 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
@ -3203,11 +3203,11 @@ 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 8e38006..19f7ae7 100644
index 2a51646..90248d8 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1360,6 +1360,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
@@ -1380,6 +1380,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.");
}
+