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

Updated Upstream (Bukkit/CraftBukkit)

Browse source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
3108e64a SPIGOT-4193: API for selecting entities by strings

CraftBukkit Changes:
ad6070df SPIGOT-4193: API for selecting entities by strings
This commit is contained in:
Shane Freeder 2019-01-31 04:49:52 +00:00
parent e87859d8a5
commit 7a73ce03e9
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
33 changed files with 247 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
View file

@ -1,4 +1,4 @@
From 9fa647183cd2baf1c91e1138b8da71cab372831a Mon Sep 17 00:00:00 2001
From 91f8d92c9957a90a8f35f0459b3775b7e592b4ba 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 60e7ceb6..66ebbaf7 100644
index e1704ae2a..a312a662b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1430,6 +1430,15 @@ public final class Bukkit {
@@ -1456,6 +1456,15 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
@ -26,10 +26,10 @@ index 60e7ceb6..66ebbaf7 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 2c07e6a2..2fbee277 100644
index 89f68d58e..a03591829 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1242,4 +1242,6 @@ public interface Server extends PluginMessageRecipient {
@@ -1266,4 +1266,6 @@ public interface Server extends PluginMessageRecipient {
// Spigot end
void reloadPermissions(); // Paper
@ -37,7 +37,7 @@ index 2c07e6a2..2fbee277 100644
+ boolean reloadCommandAliases(); // Paper
}
diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
index 30d60247..938959aa 100644
index 30d60247e..938959aa5 100644
--- a/src/main/java/org/bukkit/command/CommandMap.java
+++ b/src/main/java/org/bukkit/command/CommandMap.java
@@ -123,4 +123,13 @@ public interface CommandMap {
@ -55,7 +55,7 @@ index 30d60247..938959aa 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 65ad78c4..41e95692 100644
index 65ad78c48..41e95692e 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -279,4 +279,10 @@ public class SimpleCommandMap implements CommandMap {
@ -70,7 +70,7 @@ index 65ad78c4..41e95692 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
index f331a442..a977045d 100644
index f331a4423..a977045de 100644
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
@@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {