diff options
| author | Zach Brown <[email protected]> | 2016-12-16 15:00:16 -0600 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2016-12-16 15:00:16 -0600 |
| commit | 1d8b7e2ecc777afc18fabb317c6cbf98556a1a14 (patch) | |
| tree | e9b88f417887e87bd06525695083d8a0bce3fcb0 /Spigot-API-Patches/0003-Timings-v2.patch | |
| parent | f087ac45e35b054302d81f2ef3a9577bd42a2d91 (diff) | |
| download | Paper-1d8b7e2ecc777afc18fabb317c6cbf98556a1a14.tar.gz Paper-1d8b7e2ecc777afc18fabb317c6cbf98556a1a14.zip | |
Update upstream B/CB
Diffstat (limited to 'Spigot-API-Patches/0003-Timings-v2.patch')
| -rw-r--r-- | Spigot-API-Patches/0003-Timings-v2.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch index 48d14a838d..8bc6240741 100644 --- a/Spigot-API-Patches/0003-Timings-v2.patch +++ b/Spigot-API-Patches/0003-Timings-v2.patch @@ -1,4 +1,4 @@ -From d01fb3a2f5dbe0d60e5d7bfd25c16a040df5315e Mon Sep 17 00:00:00 2001 +From db5fdbf9e4aa5d4ae6de2c73e045656da6d057ed Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -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 36094b5..b4a4ed5 100644 +index 6299843..64c35df 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1440,6 +1440,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1455,6 +1455,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."); } @@ -3656,5 +3656,5 @@ index 8d98297..7e89b97 100644 - } } -- -2.10.2 +2.9.3 |