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

Updated Upstream (Bukkit/CraftBukkit/Spigot)

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:
9d0221aa API to get client side view distance.
9be7f0ea SPIGOT-4395: Additions to PlayerBedEnterEvent.
01e534c6 Minor cosmetic cleanups to imports etc

CraftBukkit Changes:
96c461b3 API to get client side view distance.
e2785f4e Remove note about development build
a8000588 SPIGOT-4395: Additions to PlayerBedEnterEvent.

Spigot Changes:
117d4f7e Rebuild patches
This commit is contained in:
Shane Freeder 2018-11-03 00:23:27 +00:00
parent 6c2709118f
commit 1e39773b53
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
68 changed files with 465 additions and 470 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 2e4bd921ec9d8b9da7b6bdd24ff257a3f7859f8b Mon Sep 17 00:00:00 2001
From 667e0445be4fd373482c993003ed3d3bbb2b8f45 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,7 +6,7 @@ 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 438e141d..e4e9c8f9 100644
index 438e141d1..e4e9c8f99 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1348,6 +1348,15 @@ public final class Bukkit {
@ -26,7 +26,7 @@ index 438e141d..e4e9c8f9 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 2f515d2a..678ef158 100644
index 2f515d2ac..678ef1589 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1168,4 +1168,6 @@ public interface Server extends PluginMessageRecipient {
@ -37,7 +37,7 @@ index 2f515d2a..678ef158 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,10 +55,10 @@ 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 75dfa95e..afc0774b 100644
index 65ad78c48..41e95692e 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -280,4 +280,10 @@ public class SimpleCommandMap implements CommandMap {
@@ -279,4 +279,10 @@ public class SimpleCommandMap implements CommandMap {
}
}
}
@ -70,7 +70,7 @@ index 75dfa95e..afc0774b 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 {