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

12
Spigot-API-Patches/0007-Entity-Origin-API.patch
View file

@ -1,17 +1,17 @@
From 9255c7c4f217118a550d9492fa7aa6e33a921841 Mon Sep 17 00:00:00 2001
From bafc92cd32e071029e7b2737dbff78255953084d Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 17:50:31 -0600
Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 69bdb460..c0b7426d 100644
index 0144bef9..fbff9860 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -486,4 +486,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -487,4 +487,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@Override
Spigot spigot();
// Spigot End
// Spigot end
+
+ // Paper start
+ /**
@ -61,5 +61,5 @@ index 3ce322d9..69df487b 100644
+ public org.bukkit.Location getSourceLoc();
}
--
2.12.0.windows.1
2.13.0

10
Spigot-API-Patches/0015-Expose-server-CommandMap.patch
View file

@ -1,11 +1,11 @@
From cbcb424cbb5b28efffe80c1fb6f641332954ba25 Mon Sep 17 00:00:00 2001
From ee9faa9162c7b9f27b5b1072e016c288f54f8e6a Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Mon, 29 Feb 2016 19:48:59 -0600
Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 4f094f7b..5147cbda 100644
index 89135b86..94ec8189 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor;
@ -20,7 +20,7 @@ index 4f094f7b..5147cbda 100644
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
@@ -1154,6 +1151,17 @@ public final class Bukkit {
@@ -1164,6 +1161,17 @@ public final class Bukkit {
return server.getUnsafe();
}
@ -39,7 +39,7 @@ index 4f094f7b..5147cbda 100644
{
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a503bb49..ed3a7197 100644
index c81c073d..63624ff6 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor;
@ -70,5 +70,5 @@ index a503bb49..ed3a7197 100644
* Get the advancement specified by this key.
*
--
2.11.0
2.13.0

16
Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
View file

@ -1,17 +1,17 @@
From a619922d4911b32ce2aacbadd02478679af1b76e Mon Sep 17 00:00:00 2001
From c90eb35aed8c00523955820c86367fbbe5e39b0c Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Tue, 8 Mar 2016 13:05:59 -0800
Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
index 148756b9..4ad0028c 100644
index abf68a2c..fcb03b83 100644
--- a/src/main/java/org/bukkit/command/CommandSender.java
+++ b/src/main/java/org/bukkit/command/CommandSender.java
@@ -32,4 +32,30 @@ public interface CommandSender extends Permissible {
* @return Name of the sender
*/
public String getName();
@@ -58,4 +58,30 @@ public interface CommandSender extends Permissible {
Spigot spigot();
// Spigot end
+
+ // Paper start
+ /**
@ -40,7 +40,7 @@ index 148756b9..4ad0028c 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index d19a928d..54d05113 100644
index 34a9d696..78f877d9 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -400,6 +400,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -60,5 +60,5 @@ index d19a928d..54d05113 100644
spigot().sendMessage(components);
}
--
2.11.0
2.13.0

14
Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
View file

@ -1,4 +1,4 @@
From ecdc6512316f64881451b0359268c276a4888615 Mon Sep 17 00:00:00 2001
From 15936361399b2a1b2fb350651eb83510875f955c Mon Sep 17 00:00:00 2001
From: William <admin@domnian.com>
Date: Fri, 18 Mar 2016 03:28:07 -0400
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 9af61bad..43510bad 100644
index 970d651b..4a725d79 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1180,6 +1180,13 @@ public final class Bukkit {
@@ -1190,6 +1190,13 @@ public final class Bukkit {
public static CommandMap getCommandMap() {
return server.getCommandMap();
}
@ -24,13 +24,13 @@ index 9af61bad..43510bad 100644
public static Server.Spigot spigot()
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a5750304..8922551f 100644
index 9de7693a..3c550d06 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1018,4 +1018,6 @@ public interface Server extends PluginMessageRecipient {
}
@@ -1028,4 +1028,6 @@ public interface Server extends PluginMessageRecipient {
Spigot spigot();
// Spigot end
+
+ void reloadPermissions(); // Paper
}
@ -105,5 +105,5 @@ index d68e3bee..7aece13e 100644
+
}
--
2.11.0
2.13.0

20
Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch
View file

@ -1,17 +1,18 @@
From 5f3ad3c3d105730323ea950c36892c1c548f4437 Mon Sep 17 00:00:00 2001
From b3c6eea6591a465f977f69067e464599a533209b Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Fri, 4 Mar 2016 03:13:18 -0500
Subject: [PATCH] Arrow pickup rule API
diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
index 1ff09518..da4678d0 100644
index 5850ab6c..a8d1826a 100644
--- a/src/main/java/org/bukkit/entity/Arrow.java
+++ b/src/main/java/org/bukkit/entity/Arrow.java
@@ -72,6 +72,40 @@ public interface Arrow extends Projectile {
CREATIVE_ONLY
}
@@ -90,4 +90,38 @@ public interface Arrow extends Projectile {
@Override
Spigot spigot();
// Spigot end
+
+ // Paper start
+ /**
+ * Gets the {@link PickupRule} for this arrow.
@ -45,10 +46,7 @@ index 1ff09518..da4678d0 100644
+ CREATIVE_ONLY;
+ }
+ // Paper end
+
public class Spigot extends Entity.Spigot
{
}
--
2.12.2
2.13.0

14
Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
View file

@ -1,4 +1,4 @@
From 17605bbb3704c5077bcf3a12aabe346de9684f78 Mon Sep 17 00:00:00 2001
From 6007028122abaeec6ca165c81a0102105305f0b0 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Mon, 28 Nov 2016 10:16:39 -0500
Subject: [PATCH] Allow Reloading of Command Aliases
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
Reload the aliases stored in commands.yml
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 43510bad..76d250f7 100644
index 4a725d79..4c20a1be 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1187,6 +1187,13 @@ public final class Bukkit {
@@ -1197,6 +1197,13 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
@ -24,11 +24,11 @@ index 43510bad..76d250f7 100644
public static Server.Spigot spigot()
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8922551f..b04b796a 100644
index 3c550d06..4f077b7c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1020,4 +1020,6 @@ public interface Server extends PluginMessageRecipient {
Spigot spigot();
@@ -1030,4 +1030,6 @@ public interface Server extends PluginMessageRecipient {
// Spigot end
void reloadPermissions(); // Paper
+
@ -94,5 +94,5 @@ index 040509c1..0069bcc0 100644
confirmed = true;
} else {
--
2.11.0
2.13.0

13
Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch
View file

@ -1,11 +1,11 @@
From 4ac089216d11037b15f9defa13570faa34f88a0c Mon Sep 17 00:00:00 2001
From 035ce398f1135f3d6b47407cc30365e5c5afca09 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 20 Dec 2016 15:55:55 -0500
Subject: [PATCH] Add String based Action Bar API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f9d24bfd..2f7c96ee 100644
index 05b88e5b..5c76497f 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -395,6 +395,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -47,7 +47,7 @@ index f9d24bfd..2f7c96ee 100644
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(position, components);
}
@@ -1715,9 +1737,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1707,9 +1729,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Sends the component to the specified screen position of this player
*
@ -59,19 +59,18 @@ index f9d24bfd..2f7c96ee 100644
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -1725,9 +1749,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1717,9 +1741,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Sends an array of components as a single message to the specified screen position of this player
*
+ * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client.
* @param position the screen position
- * @param component the components to send
+ * @param components the components to send
* @param components the components to send
*/
+ @Deprecated
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}
--
2.11.0
2.13.0