diff options
| author | Zach Brown <[email protected]> | 2016-11-16 20:23:38 -0600 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2016-11-18 16:21:06 -0600 |
| commit | a6d146a939d4e9327f9649e55888f810f8f53737 (patch) | |
| tree | 0b62d3ee673391a41167883e0963c13ea8bbc723 /Spigot-API-Patches/0003-Timings-v2.patch | |
| parent | 6c1880847fd1695b567b77c4383322a7d00a23f9 (diff) | |
| download | Paper-a6d146a939d4e9327f9649e55888f810f8f53737.tar.gz Paper-a6d146a939d4e9327f9649e55888f810f8f53737.zip | |
Update Paper to MC 1.11
Diffstat (limited to 'Spigot-API-Patches/0003-Timings-v2.patch')
| -rw-r--r-- | Spigot-API-Patches/0003-Timings-v2.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch index 9f90c71e63..9756b42ae4 100644 --- a/Spigot-API-Patches/0003-Timings-v2.patch +++ b/Spigot-API-Patches/0003-Timings-v2.patch @@ -1,4 +1,4 @@ -From 3a72f5e0b411d51cf5ec7263a22466214012d08f Mon Sep 17 00:00:00 2001 +From 814fcd79c37cf32b74eb3a231ba4ff8e71d58c0a Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> 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 dc2c9d1..85fd9a8 100644 +index 5d8422e..ac8b0f5 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 { @@ -2900,10 +2900,10 @@ index dc2c9d1..85fd9a8 100644 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 69720e9..f82cbaf 100644 +index c5c3506..3cc741b 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -942,12 +942,27 @@ public interface Server extends PluginMessageRecipient { +@@ -925,12 +925,27 @@ public interface Server extends PluginMessageRecipient { public class Spigot { @@ -2933,7 +2933,7 @@ index 69720e9..f82cbaf 100644 * Sends the component to the player * diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index ffbe5dd..4c86694 100644 +index 08a9739..347d218 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -32,7 +32,8 @@ public abstract class Command { @@ -2954,7 +2954,7 @@ index ffbe5dd..4c86694 100644 } /** -@@ -250,7 +250,6 @@ public abstract class Command { +@@ -235,7 +235,6 @@ public abstract class Command { public boolean setLabel(String name) { this.nextLabel = name; if (!isRegistered()) { @@ -3656,5 +3656,5 @@ index 8d98297..7e89b97 100644 - } } -- -2.10.0.windows.1 +2.10.2 |