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@8b1d26d Fix diff in sprint interruption option (Closes #10939)
PaperMC/Paper@0a1b133 Revert "Fixes exception log messages getting dropped during bootstrap (#10935)" (Closes #10945)
This commit is contained in:
granny
2024-06-21 04:23:34 -07:00
parent e05f91b988
commit 2ba7beeab5
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.21-R0.1-SNAPSHOT version = 1.21-R0.1-SNAPSHOT
mcVersion = 1.21 mcVersion = 1.21
paperCommit = 2118196dd57f9b7100b2d15b552d3c00fc5a55fa paperCommit = 0a1b133c28bfa9b71cd23a10b42b521ad50aacb5
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

6
patches/server/0050-Add-player-death-exp-control-options.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add player death exp control options
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 9ef4ab973508eb139f7a44feb4bd484d8e0e03cd..025309a47e9683ec29cd94f997663b7faec1acb4 100644 index f20d0e76318d12b567755a33c8d1f99fd5d8ec11..ebfeff3ed35c40f089f15287aff283eac7f33803 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java --- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1977,9 +1977,19 @@ public abstract class Player extends LivingEntity { @@ -1976,9 +1976,19 @@ public abstract class Player extends LivingEntity {
@Override @Override
protected int getBaseExperienceReward() { protected int getBaseExperienceReward() {
if (!this.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) && !this.isSpectator()) { if (!this.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) && !this.isSpectator()) {
@@ -32,7 +32,7 @@ index 9ef4ab973508eb139f7a44feb4bd484d8e0e03cd..025309a47e9683ec29cd94f997663b7f
return 0; return 0;
} }
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b8bc547996c02cbd767515543ed11ce90680e300..13da48e261251fec8ef180acceb08b230905bc84 100644 index cde1b1277d83ac2478f872dccdc2f7f87196cc94..ed8f3c606984f83b77ca96cbfc8bcd454ad63ff8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -172,6 +172,8 @@ public class PurpurWorldConfig { @@ -172,6 +172,8 @@ public class PurpurWorldConfig {

6
patches/server/0169-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Burp delay, burp after eating food fills hunger bar
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index c582b5be87e93a0ea231bb6ce47bd10c2238037c..68f414c421458a38e5db8225524c1bf87c2627f3 100644 index bb56628073c8341492dc22a560902534710f37bb..125cdfede7afd9ed88293fbd02f7601874faa74b 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java --- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -197,6 +197,7 @@ public abstract class Player extends LivingEntity { @@ -197,6 +197,7 @@ public abstract class Player extends LivingEntity {
@@ -30,7 +30,7 @@ index c582b5be87e93a0ea231bb6ce47bd10c2238037c..68f414c421458a38e5db8225524c1bf8
this.noPhysics = this.isSpectator(); this.noPhysics = this.isSpectator();
if (this.isSpectator()) { if (this.isSpectator()) {
this.setOnGround(false); this.setOnGround(false);
@@ -2377,7 +2384,7 @@ public abstract class Player extends LivingEntity { @@ -2376,7 +2383,7 @@ public abstract class Player extends LivingEntity {
public ItemStack eat(Level world, ItemStack stack, FoodProperties foodComponent) { public ItemStack eat(Level world, ItemStack stack, FoodProperties foodComponent) {
this.getFoodData().eat(stack, foodComponent); // CraftBukkit this.getFoodData().eat(stack, foodComponent); // CraftBukkit
this.awardStat(Stats.ITEM_USED.get(stack.getItem())); this.awardStat(Stats.ITEM_USED.get(stack.getItem()));
@@ -54,7 +54,7 @@ index bd3f78e6453cfe18aa3da38176b04d734d83bb4b..515dd3b769917c4aa60ce180ef24f38c
public void eat(FoodProperties foodComponent) { public void eat(FoodProperties foodComponent) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 973d47d7a42a2e6101c9847bba596e940f252480..2d5e0eaf89fd2a116c17dc0889368057f960ca45 100644 index 21b325552e231f3fb806b7a2094de7ae5ed417cf..fc0c635bcd787bd3105ca7f9b99fd295fa2969ce 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -379,6 +379,8 @@ public class PurpurWorldConfig { @@ -379,6 +379,8 @@ public class PurpurWorldConfig {

6
patches/server/0184-Player-ridable-in-water-option.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player ridable in water option
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 2fe3af832a228b1352b9b85dec06115009ef658f..cb6f161d32fe9642e9e9b1efc47d88612041ea15 100644 index db8a97ce9eca51ae6da31e49882bb6e23443d844..5f111268179b6b736c1d031a8ab7e9e279b2d250 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java --- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -2088,6 +2088,13 @@ public abstract class Player extends LivingEntity { @@ -2087,6 +2087,13 @@ public abstract class Player extends LivingEntity {
return slot != EquipmentSlot.BODY; return slot != EquipmentSlot.BODY;
} }
@@ -23,7 +23,7 @@ index 2fe3af832a228b1352b9b85dec06115009ef658f..cb6f161d32fe9642e9e9b1efc47d8861
if (!this.isPassenger() && this.onGround() && !this.isInWater() && !this.isInPowderSnow) { if (!this.isPassenger() && this.onGround() && !this.isInWater() && !this.isInPowderSnow) {
if (this.getShoulderEntityLeft().isEmpty()) { if (this.getShoulderEntityLeft().isEmpty()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f621c656cf9287a7d715e72ae814c13224edec0c..b6962a3167b6b8804f36b198c1b06270a748bea8 100644 index c255fa7f1bc11a3bcd02b98a5464567c85325313..d7b9d515ec0103f12d33a60c98449c13a4744196 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -385,6 +385,7 @@ public class PurpurWorldConfig { @@ -385,6 +385,7 @@ public class PurpurWorldConfig {