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

Update API patches to MC 1.12pre2

Browse source
This commit is contained in:
Zach Brown 2017-05-14 08:46:44 -05:00
parent e4f891c95a
commit 828d600143
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
21 changed files with 135 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From ecdb1d39c4e927e1084293c7d1a90a3eec22a1ea Mon Sep 17 00:00:00 2001
From 260383c321c8e1b9a321cdfff94f535287739b91 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
@ -2932,10 +2932,10 @@ index 00000000..3a288d2a
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 5b6413be..7fd544eb 100644
index ab3f6c0b..e1898343 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -538,7 +538,6 @@ public final class Bukkit {
@@ -523,7 +523,6 @@ public final class Bukkit {
*/
public static void reload() {
server.reload();
@ -2944,10 +2944,10 @@ index 5b6413be..7fd544eb 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 120dba25..77cfe561 100644
index d3fdd638..30b99241 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -943,12 +943,27 @@ public interface Server extends PluginMessageRecipient {
@@ -936,12 +936,27 @@ public interface Server extends PluginMessageRecipient {
public class Spigot
{
@ -3158,7 +3158,7 @@ index 00000000..66232339
+ }
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 5965514a..466757b9 100644
index cdf838eb..39b275cb 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -31,7 +31,7 @@ public class SimpleCommandMap implements CommandMap {
@ -3451,10 +3451,10 @@ index a8f61f2d..00000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 0794688e..517e69f8 100644
index b57c81c1..d24ef805 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1497,6 +1497,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1507,6 +1507,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.");
}
@ -3467,10 +3467,10 @@ index 0794688e..517e69f8 100644
Spigot spigot();
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 10561864..4ee123e4 100644
index e13d27d2..b43ffd36 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -295,7 +295,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -292,7 +292,6 @@ public final class SimplePluginManager implements PluginManager {
}
}
@ -3478,7 +3478,7 @@ index 10561864..4ee123e4 100644
return result.toArray(new Plugin[result.size()]);
}
@@ -332,7 +331,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -329,7 +328,7 @@ public final class SimplePluginManager implements PluginManager {
if (result != null) {
plugins.add(result);
@ -3487,7 +3487,7 @@ index 10561864..4ee123e4 100644
}
return result;
@@ -358,7 +357,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -355,7 +354,7 @@ public final class SimplePluginManager implements PluginManager {
* @return Plugin if it exists, otherwise null
*/
public synchronized Plugin getPlugin(String name) {
@ -3496,7 +3496,7 @@ index 10561864..4ee123e4 100644
}
public synchronized Plugin[] getPlugins() {
@@ -556,7 +555,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -553,7 +552,8 @@ public final class SimplePluginManager implements PluginManager {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}
@ -3506,7 +3506,7 @@ index 10561864..4ee123e4 100644
getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
} else {
getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
@@ -717,7 +717,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -714,7 +714,7 @@ public final class SimplePluginManager implements PluginManager {
}
public boolean useTimings() {
@ -3515,7 +3515,7 @@ index 10561864..4ee123e4 100644
}
/**
@@ -726,6 +726,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -723,6 +723,6 @@ public final class SimplePluginManager implements PluginManager {
* @param use True if per event timing code should be used
*/
public void useTimings(boolean use) {
@ -3829,5 +3829,5 @@ index 8d982974..7e89b97b 100644
- }
}
--
2.12.1.windows.1
2.11.0