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

Updated Upstream (Paper)

Browse Source 
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:
granny
2025-06-30 12:37:41 -07:00
parent fe00a838e5
commit a7adc7bc07
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml generated
View File

@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run Purpur Paperclip Jar" type="JarApplication"> <configuration default="false" name="Run Purpur Paperclip Jar" type="JarApplication">
<option name="JAR_PATH" value="$PROJECT_DIR$/purpur-server/build/libs/purpur-paperclip-1.21.6-R0.1-SNAPSHOT-mojmap.jar" /> <option name="JAR_PATH" value="$PROJECT_DIR$/purpur-server/build/libs/purpur-paperclip-1.21.7-R0.1-SNAPSHOT-mojmap.jar" />
<option name="VM_PARAMETERS" value="-Dcom.mojang.eula.agree" /> <option name="VM_PARAMETERS" value="-Dcom.mojang.eula.agree" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run" />
<option name="ALTERNATIVE_JRE_PATH" /> <option name="ALTERNATIVE_JRE_PATH" />

4
gradle.properties
View File

@@ -1,8 +1,8 @@
group = org.purpurmc.purpur group = org.purpurmc.purpur
version = 1.21.7-R0.1-SNAPSHOT version = 1.21.7-R0.1-SNAPSHOT
mcVersion = 1.21.7-rc2 mcVersion = 1.21.7
paperCommit = a9f74cbf6e740c76ad812abde855434abc9526a0 paperCommit = 6e021c82726ae12ad95aacc23232c32ca758fcec
org.gradle.configuration-cache = true org.gradle.configuration-cache = true
org.gradle.caching = true org.gradle.caching = true

4
purpur-api/paper-patches/files/src/main/java/org/bukkit/command/SimpleCommandMap.java.patch
View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/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; return false;
} }
@@ -20,7 +20,7 @@
// Paper start - Plugins do weird things to workaround normal registration // Paper start - Plugins do weird things to workaround normal registration
if (target.timings == null) { if (target.timings == null) {
target.timings = co.aikar.timings.TimingsManager.getCommandTiming(null, target); target.timings = co.aikar.timings.TimingsManager.getCommandTiming(null, target);
@@ -153,10 +_,10 @@ @@ -155,10 +_,10 @@
// Paper end // Paper end
try { try {

2
purpur-api/paper-patches/files/src/main/java/org/bukkit/event/inventory/InventoryType.java.patch
View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
+++ b/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), SMITHING_NEW(4, "Upgrade Gear", MenuType.SMITHING),
; ;

4
purpur-server/build.gradle.kts.patch
View File

@@ -25,8 +25,8 @@
+ // Purpur end - Rebrand + // Purpur end - Rebrand
+ +
spigot { spigot {
enabled = false enabled = true
buildDataRef = "281ac0de7a76d808753ede97d11b034bc801b63d" buildDataRef = "436eac9815c211be1a2a6ca0702615f995e81c44"
@@ -107,7 +_,21 @@ @@ -107,7 +_,21 @@
} }
} }

4
purpur-server/paper-patches/features/0003-Barrels-and-enderchests-6-rows.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Barrels and enderchests 6 rows
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index c00ddfe41439954fa0fd87c0933f274c8a752eb6..5fde4c71915f55f100cd30406803d6fca5b573dc 100644 index 2f41a92465b9da28e026297cc3528898bb1c8412..83ae4b40e33e0dc58e0fd6aacf22e22ae0cd3684 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -150,8 +150,19 @@ public class CraftContainer extends AbstractContainerMenu { @@ -148,8 +148,19 @@ public class CraftContainer extends AbstractContainerMenu {
case PLAYER: case PLAYER:
case CHEST: case CHEST:
case ENDER_CHEST: case ENDER_CHEST: