Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Airplane)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
b470400d5c Add methods to find targets for lightning strikes (#6712)
381a1462b3 Fix unplaced block states after new chunk gen API (#6747)
523a55c609 Fix loading cmds in datapacks (#6641)
a61827df91 VanillaCommandWrapper didnt account for entity senders (#6586)
cd610df101 Re-readd root/admin user detection (#6703)
4a0d935cd0 Always allow item changing in EntityFireball (#5493)
54813dbb21 [ci skip] Misc gradle updates (#6763)
56e65fd3a7 Null check isApplicable for CraftBlockEntityState#update
8575248648 Use ChatRenderer.defaultRenderer() when legacy events have not modified the format (#6104)

Airplane Changes:
f96ca1ce5d Upstream
89cdb2c72a Update Paperweight deps
317e61bb48 We love CI testing
This commit is contained in:
William Blake Galbreath
2021-10-13 07:51:34 -05:00
parent 91d3e65a73
commit 32fc651f97
9 changed files with 36 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0027-Fix-vanilla-command-permission-handler.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix vanilla command permission handler
diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
index 30274979d8dafc7c0a374c3e6b1d1b5dbd6cfe4c..a3bc8192c10f888c0d395709108019670f0bad62 100644
index f64aa22ed6fcb4af67317b99f459ee5296392548..36c91793e0aa4895193623cf8cba7820d31f4eca 100644
--- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
+++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
@@ -34,6 +34,7 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
@@ -17,10 +17,10 @@ index 30274979d8dafc7c0a374c3e6b1d1b5dbd6cfe4c..a3bc8192c10f888c0d39570910801967
public void removeCommand(String name) {
this.children.remove(name);
diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
index e9d1fb479855194da5a05e86861848158736cbb4..b06f070a8030e5a6d965a2705749874895db58b6 100644
index 4aa1dc543950b5de64345b3403a6d0bc41c521df..1c19a64da230268ceb9124bb7e1a141d78ac3393 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
@@ -87,6 +87,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {
@@ -89,6 +89,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {
}
public static String getPermission(CommandNode<CommandSourceStack> vanillaCommand) {