Skip to content
This repository was archived by the owner on Apr 13, 2025. It is now read-only.

Commit 4a3b139

Browse files
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@45198578 Set old position / rotation for newly created entities PaperMC/Paper@8e69d981 Player - Expose player score (#12243) PaperMC/Paper@2526fe06 Add type to represent unimplemented data component types (#12222) PaperMC/Paper@20df25d3 Don't resync all attributes when updating scaled health (#12232) PaperMC/Paper@43f37b1b Remove ItemFactory#enchantWithLevels range check for vanilla parity (#12209) PaperMC/Paper@a2b0ff06 Fix cancelling PlayerInteractEvent at (0, 0, 0) (#12215) PaperMC/Paper@df96f8a0 Correctly handle events for end portal (#12246) PaperMC/Paper@25654978 Cancel PlayerLaunchProjectileEvent properly for enderpearls (#12223) PaperMC/Paper@34c794dc ServerTickManager#requestGameToSprint - Silence command like feedback (#12220)
1 parent 304174e commit 4a3b139

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
22
version = 1.21.4-R0.1-SNAPSHOT
33

44
mcVersion = 1.21.4
5-
paperCommit = ce3001621894ea775206abe455442d0aeeef3535
5+
paperCommit = 34c794dc51305e50c315e07e555a4ba10c208357
66

77
org.gradle.configuration-cache = true
88
org.gradle.caching = true

purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
--- a/src/main/java/org/bukkit/entity/Player.java
22
+++ b/src/main/java/org/bukkit/entity/Player.java
3-
@@ -3902,4 +_,123 @@
4-
* @return the result of this method, holding leftovers and spawned items.
3+
@@ -3918,4 +_,123 @@
4+
* @param score New death screen score of player
55
*/
6-
PlayerGiveResult give(Collection<ItemStack> items, boolean dropIfFull);
6+
void setDeathScreenScore(int score);
77
+
88
+ // Purpur start
99
+ /**

purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
this.serverLevelData.setThundering(false, org.bukkit.event.weather.ThunderChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
162162
// CraftBukkit start
163163
// If we stop due to everyone sleeping we should reset the weather duration to some other random value.
164-
@@ -2678,7 +_,7 @@
164+
@@ -2679,7 +_,7 @@
165165
// Spigot start
166166
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
167167
// Paper start - Fix merchant inventory not closing on entity removal

purpur-server/minecraft-patches/sources/net/minecraft/world/item/EnderpearlItem.java.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
player.awardStat(Stats.ITEM_USED.get(this));
1616
+ player.getCooldowns().addCooldown(itemInHand, player.getAbilities().instabuild ? level.purpurConfig.enderPearlCooldownCreative : level.purpurConfig.enderPearlCooldown); // Purpur - Configurable Ender Pearl cooldown
1717
} else {
18-
// Paper end - PlayerLaunchProjectileEvent
19-
player.containerMenu.sendAllDataToRemote();
18+
if (player instanceof net.minecraft.server.level.ServerPlayer serverPlayer) {
19+
serverPlayer.deregisterEnderPearl(thrownEnderpearl.projectile());

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
private void validateSpeed(float value) {
4747
Preconditions.checkArgument(value <= 1f && value >= -1f, "Speed value (%s) need to be between -1f and 1f", value);
4848
}
49-
@@ -3599,4 +_,76 @@
50-
51-
return forwardMovement == backwardMovement ? 0 : forwardMovement ? 1 : -1;
49+
@@ -3606,4 +_,76 @@
50+
public void setDeathScreenScore(final int score) {
51+
getHandle().setScore(score);
5252
}
5353
+
5454
+ // Purpur start - Purpur client support

0 commit comments

Comments
 (0)