mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@4045339e 1.21.7 PaperMC/Paper@4c47c76e Update DataConverter constants for 1.21.7 PaperMC/Paper@9686f8b3 Enable obfuscation mappings for 1.21.7 (#12770) PaperMC/Paper@723510f9 Make warning of PlayerLoginEvent use unique plugin names (#12772) PaperMC/Paper@4cdcf00d Only namespaced reload (#12773) PaperMC/Paper@00e79dfb Fix wrong size in InventoryType#PLAYER (#12758) PaperMC/Paper@6e021c82 Fix CraftContainer#getNotchInventoryType detection of player inventory (#12751)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
@@ -146,6 +_,19 @@
|
||||
@@ -148,6 +_,19 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
// Paper start - Plugins do weird things to workaround normal registration
|
||||
if (target.timings == null) {
|
||||
target.timings = co.aikar.timings.TimingsManager.getCommandTiming(null, target);
|
||||
@@ -153,10 +_,10 @@
|
||||
@@ -155,10 +_,10 @@
|
||||
// Paper end
|
||||
|
||||
try {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
||||
+++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
||||
@@ -164,7 +_,7 @@
|
||||
@@ -166,7 +_,7 @@
|
||||
SMITHING_NEW(4, "Upgrade Gear", MenuType.SMITHING),
|
||||
;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user