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

Update upstream B/CB/S

Browse source
This commit is contained in:
Zach Brown 2017-05-15 11:25:20 -05:00
parent 8e610af635
commit baf762a2c1
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
26 changed files with 123 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 260383c321c8e1b9a321cdfff94f535287739b91 Mon Sep 17 00:00:00 2001
From 0ffc8e7433517a74d77068bc0e6abf9f48611aae 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,7 +2932,7 @@ index 00000000..3a288d2a
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index ab3f6c0b..e1898343 100644
index 5649aaf7..b7c939a2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -523,7 +523,6 @@ public final class Bukkit {
@ -2944,11 +2944,11 @@ index ab3f6c0b..e1898343 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index d3fdd638..30b99241 100644
index 7a08fd1e..7dd895a0 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -936,12 +936,27 @@ public interface Server extends PluginMessageRecipient {
@@ -945,12 +945,27 @@ public interface Server extends PluginMessageRecipient {
// Spigot start
public class Spigot
{
-
@ -3054,10 +3054,10 @@ index 3f07d7f4..f89ad075 100644
}
diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
new file mode 100644
index 00000000..66232339
index 00000000..5527e7c8
--- /dev/null
+++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
@@ -0,0 +1,99 @@
@@ -0,0 +1,105 @@
+package org.bukkit.command;
+
+import org.apache.commons.lang.NotImplementedException;
@ -3156,6 +3156,12 @@ index 00000000..66232339
+ default Set<PermissionAttachmentInfo> getEffectivePermissions() {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ default Spigot spigot() {
+ throw new NotImplementedException();
+ }
+
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index cdf838eb..39b275cb 100644
@ -3451,10 +3457,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 b57c81c1..d24ef805 100644
index 9764caa4..266181aa 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1507,6 +1507,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1499,6 +1499,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.");
}
@ -3465,7 +3471,7 @@ index b57c81c1..d24ef805 100644
+ }
}
Spigot spigot();
@Override
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index e13d27d2..b43ffd36 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@ -3829,5 +3835,5 @@ index 8d982974..7e89b97b 100644
- }
}
--
2.11.0
2.13.0