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

Update Paper to MC 1.11

Browse source
This commit is contained in:
Zach Brown 2016-11-16 20:23:38 -06:00
parent 6c1880847f
commit a6d146a939
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
193 changed files with 1635 additions and 1846 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 3a72f5e0b411d51cf5ec7263a22466214012d08f Mon Sep 17 00:00:00 2001
From 814fcd79c37cf32b74eb3a231ba4ff8e71d58c0a 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 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