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@102c8bbc Add config for updating equipment on player actions (#12275)
PaperMC/Paper@f0388e2f Call EntityPushedByEntityAttackEvent for Mace AoE (#12257)
PaperMC/Paper@c37b890c More deferred requireNonNull message creation
PaperMC/Paper@310f5229 Add unsupported config option and internal API to simplify remote item matching
PaperMC/Paper@6ea42025 Send all attributes on respawn (#12274)
PaperMC/Paper@2d3a1385 [ci/skip] Refine recipe management API documentation. (#12287)
PaperMC/Paper@aaaeb4e1 [ci/skip] Make compilation logs actually readable (#12276)
PaperMC/Paper@bb1beda6 feat: add event to wind charge explode (#12248)
PaperMC/Paper@9f004614 Update a whole lot of deprecated annotations
PaperMC/Paper@72f13f8b [ci/skip] Mention API Checks for CONTRIBUTING.md (#12315)
PaperMC/Paper@7cc6cb50 Check for trailing input in ItemFactory#createItemStack (#12312)
PaperMC/Paper@f49d18df Add get/set customName to Skull block (#12302)
PaperMC/Paper@894631f0 Make advancement ordering predictable (#12292)
PaperMC/Paper@2aad131e Add config option for command spam whitelist
PaperMC/Paper@bb3b7e69 Fix annotation mistakes
PaperMC/Paper@058455e4 InventoryView QOL open method (#12282)
PaperMC/Paper@f2258582 Fix firework entity not being removed when FireworkExplodeEvent is cancelled (#12268)
PaperMC/Paper@7819df10 Add getHeight method to ChunkData (#12311)
PaperMC/Paper@37b9ca1f Add flush parameter to World#save (#12330)
PaperMC/Paper@515e12ca Check if BUNDLE_CONTENTS is present in InventoryClickEvent (#12321)
PaperMC/Paper@5a6ab97b Add config to remove player as vehicle restriction in /ride (#12327)
PaperMC/Paper@c467df95 Add ItemStack#copyDataFrom (#12224)
PaperMC/Paper@78af68b6 fix some ticket related decompile errors
PaperMC/Paper@ce3ede47 Server now says yes to movement
PaperMC/Paper@eafb6c29 Merge remote-tracking branch 'up/main' into update/1.21.5
PaperMC/Paper@5ef8349e Merge remote-tracking branch 'up/update/1.21.5' into update/1.21.5
PaperMC/Paper@1111f183 Update remote item matching option
PaperMC/Paper@58554542 Fix oopsie
PaperMC/Paper@b8078d38 Update to 1.21.5-rc2
PaperMC/Paper@a776d7a9 update entity effect
PaperMC/Paper@67cc0e5f bump built-in datapack version
PaperMC/Paper@28daa6ce update adventure codecs, fixes click and hover events
PaperMC/Paper@e50bb66a make Phantom#anchorPoint nullable
This commit is contained in:
granny
2025-03-24 13:43:27 -07:00
parent c8d8532712
commit cb8448ffe7
11 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -1,8 +1,8 @@
group = org.purpurmc.purpur
version = 1.21.5-R0.1-SNAPSHOT
mcVersion = 1.21.5-rc1
paperCommit = 92abbc6ccc73e4da969c3aa6d71efd880197412e
mcVersion = 1.21.5-rc2
paperCommit = e50bb66a012d256305c9904330200fa2a634b723
org.gradle.configuration-cache = true
org.gradle.caching = true

4
purpur-api/paper-patches/features/0002-Purpur-config-files.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 313af4c93ba978f8727110c293d1588bc1651c71..f89b1218f0162d35384cbffa2d4a93d3fb559f00 100644
index 53ad1696d02afbebf27663dd753fa93e41cfeb4e..cec387842895d617b0dcf9158f080fe03e08a926 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2371,6 +2371,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2369,6 +2369,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Paper end

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

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2994,4 +_,133 @@
@@ -2997,4 +_,133 @@
public static void restart() {
server.restart();
}

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

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2707,4 +_,111 @@
@@ -2705,4 +_,111 @@
*/
void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
// Paper end - API to check if the server is sleeping

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

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4277,6 +_,86 @@
@@ -4283,6 +_,86 @@
@Nullable
public DragonBattle getEnderDragonBattle();

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

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -21,6 +_,13 @@
@@ -22,6 +_,13 @@
import org.bukkit.persistence.PersistentDataContainer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -14,7 +14,7 @@
/**
* Represents a stack of items.
@@ -1345,4 +_,482 @@
@@ -1371,4 +_,482 @@
return this.craftDelegate.matchesWithoutData(item, excludeTypes, ignoreCount);
}
// Paper end - data component API

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

@@ -1,19 +1,9 @@
--- a/paper-server/build.gradle.kts
+++ b/paper-server/build.gradle.kts
@@ -18,11 +_,21 @@
@@ -24,6 +_,16 @@
// oldPaperCommit = "f4f275519f7c1fbe9db173b7144a4fe81440e365"
//}
paperweight {
minecraftVersion = providers.gradleProperty("mcVersion")
- gitFilePatches = false
-
- updatingMinecraft {
- oldPaperCommit = "f4f275519f7c1fbe9db173b7144a4fe81440e365"
+ //gitFilePatches = true
+
+ //updatingMinecraft {
+ // oldPaperCommit = "f4f275519f7c1fbe9db173b7144a4fe81440e365"
+ //}
+
+ val purpur = forks.register("purpur") {
+ upstream.patchDir("paperServer") {
+ upstreamPath = "paper-server"
@@ -21,11 +11,12 @@
+ patchesDir = rootDirectory.dir("purpur-server/paper-patches")
+ outputDir = rootDirectory.dir("paper-server")
+ }
}
+ }
+ activeFork = purpur
+
spigot {
buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42"
packageVersion = "v1_21_R3" // also needs to be updated in MappingEnvironment
@@ -104,7 +_,21 @@
}
}

8
purpur-server/paper-patches/features/0005-Add-EntityTeleportHinderedEvent.patch
View File

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 65c4c0690874c29814098448b6cc6077a1e8c566..549f6fcf5ded0563e665673a797fa92496786c3b 100644
index e7fec5d2d54dc02bad76cb4100f597208ae46912..2344ee5f7c76d4c0eff375826e75cb97e104c3f1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -264,6 +264,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -29,10 +29,10 @@ index 65c4c0690874c29814098448b6cc6077a1e8c566..549f6fcf5ded0563e665673a797fa924
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d53cc5f0952be042629cd8e6e319157d0afb14c7..9b72d1e90ceb531088ace34ff11db12a4bcba2b7 100644
index 9bea9f41cbffaacb77b27636086c57b6f8cb17d7..dcdf06516b0bcfaa191ed82f4236602710d11e44 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1420,6 +1420,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1422,6 +1422,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Paper start - Teleport passenger API
// Don't allow teleporting between worlds while keeping passengers
if (ignorePassengers && entity.isVehicle() && location.getWorld() != this.getWorld()) {
@@ -40,7 +40,7 @@ index d53cc5f0952be042629cd8e6e319157d0afb14c7..9b72d1e90ceb531088ace34ff11db12a
return false;
}
@@ -1441,6 +1442,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1443,6 +1444,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API

2
purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch
View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -273,6 +_,7 @@
@@ -276,6 +_,7 @@
@Override
public void recalculatePermissions() {
this.perm.recalculatePermissions();

10
purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch
View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -590,10 +_,15 @@
@@ -592,10 +_,15 @@
@Override
public void setPlayerListName(String name) {
@@ -17,7 +17,7 @@
if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
for (ServerPlayer player : (List<ServerPlayer>) this.server.getHandle().players) {
if (player.getBukkitEntity().canSee(this)) {
@@ -2730,6 +_,28 @@
@@ -2732,6 +_,28 @@
return this.getHandle().getAbilities().walkingSpeed * 2f;
}
@@ -46,9 +46,9 @@
private void validateSpeed(float value) {
Preconditions.checkArgument(value <= 1f && value >= -1f, "Speed value (%s) need to be between -1f and 1f", value);
}
@@ -3576,4 +_,76 @@
public void setDeathScreenScore(final int score) {
getHandle().setScore(score);
@@ -3594,4 +_,76 @@
public void setSimplifyContainerDesyncCheck(final boolean simplifyContainerDesyncCheck) {
this.simplifyContainerDesyncCheck = simplifyContainerDesyncCheck;
}
+
+ // Purpur start - Purpur client support

2
purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch
View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -649,4 +_,285 @@
@@ -669,4 +_,285 @@
}
// Paper end - data component API