Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-06-21 09:47:45 +02: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@34cf3ab0 Fix loot tables being reset before death event (#13886)
PaperMC/Paper@10a73fe4 Add and clarify Attribute#getDefaultValue (#13345)
This commit is contained in:
granny
2026-05-31 16:53:09 -07:00
parent 3fe5edd4b5
commit 025765845f
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -3,7 +3,7 @@ group = org.purpurmc.purpur
mcVersion = 26.1.2 mcVersion = 26.1.2
apiVersion = 26.1.2 apiVersion = 26.1.2
channel=STABLE channel=STABLE
paperCommit = fd45f4b2e38a1b0ea18dee6fc8a8b420e9b069e1 paperCommit = 10a73fe40f39d51e6a35e55154229bc9508a16d1
org.gradle.configuration-cache = true org.gradle.configuration-cache = true
org.gradle.caching = true org.gradle.caching = true

10
purpur-server/minecraft-patches/features/0001-Ridables.patch
View File

@@ -153,7 +153,7 @@ index a4a0683c0287da0543a5c869163c925f899b1550..241ff14c2c27204fc8615b19700f946a
+ // Purpur end - Ridables + // Purpur end - Ridables
} }
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index aecec886b7fc1eed340fdae1074f229fd49f06ee..bb6dc165d393a527564810e0cd2f8137e5272b9e 100644 index 93191aa5a24f9390d0d8c7c384c700dbe18d0212..2e620309bedbd08d8791b165c6a60080c55589d8 100644
--- a/net/minecraft/world/entity/LivingEntity.java --- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java
@@ -243,9 +243,9 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin @@ -243,9 +243,9 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -243,7 +243,7 @@ index aecec886b7fc1eed340fdae1074f229fd49f06ee..bb6dc165d393a527564810e0cd2f8137
// Paper end - Add EntityMoveEvent // Paper end - Add EntityMoveEvent
if (this.level() instanceof ServerLevel serverLevel && this.isSensitiveToWater() && this.isInWaterOrRain()) { if (this.level() instanceof ServerLevel serverLevel && this.isSensitiveToWater() && this.isInWaterOrRain()) {
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
index 6916de6628676fc775ab4dda949ebb7facdf58b2..d9c5d2e1c638370434e52422c9643c3521f1bb42 100644 index 8569908576be0cb8f47ec94d065736f5e0fc114e..31cb7f27dc114f347b1667a3ad7e99d4ccff8d34 100644
--- a/net/minecraft/world/entity/Mob.java --- a/net/minecraft/world/entity/Mob.java
+++ b/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java
@@ -156,8 +156,8 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs @@ -156,8 +156,8 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
@@ -257,7 +257,7 @@ index 6916de6628676fc775ab4dda949ebb7facdf58b2..d9c5d2e1c638370434e52422c9643c35
this.jumpControl = new JumpControl(this); this.jumpControl = new JumpControl(this);
this.bodyRotationControl = this.createBodyControl(); this.bodyRotationControl = this.createBodyControl();
this.navigation = this.createNavigation(level); this.navigation = this.createNavigation(level);
@@ -603,6 +603,7 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs @@ -609,6 +609,7 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
} }
} }
} else { } else {
@@ -265,7 +265,7 @@ index 6916de6628676fc775ab4dda949ebb7facdf58b2..d9c5d2e1c638370434e52422c9643c35
this.igniteForSeconds(8.0F); this.igniteForSeconds(8.0F);
} }
} }
@@ -1362,7 +1363,7 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs @@ -1368,7 +1369,7 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
} }
protected InteractionResult mobInteract(final Player player, final InteractionHand hand) { protected InteractionResult mobInteract(final Player player, final InteractionHand hand) {
@@ -274,7 +274,7 @@ index 6916de6628676fc775ab4dda949ebb7facdf58b2..d9c5d2e1c638370434e52422c9643c35
} }
protected void usePlayerItem(final Player player, final InteractionHand hand, final ItemStack itemStack) { protected void usePlayerItem(final Player player, final InteractionHand hand, final ItemStack itemStack) {
@@ -1705,4 +1706,58 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs @@ -1711,4 +1712,58 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
public float chargeSpeedModifier() { public float chargeSpeedModifier() {
return 1.0F; return 1.0F;
} }

6
purpur-server/minecraft-patches/features/0015-Add-mobGriefing-override-to-everything-affected.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing override to everything affected
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index 34d122f58ff32cb47b79ab1348fee3224315d2dd..af7a1eebe6f3d9876a1a730f4ca9b0814ed57332 100644 index 17dab3c08b4cf38b890e064b70edb9cfb2c23e73..c3bf8c3d9e34940c40a0bf453bea3ca4191b2411 100644
--- a/net/minecraft/world/entity/LivingEntity.java --- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java
@@ -1953,7 +1953,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin @@ -1953,7 +1953,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -18,10 +18,10 @@ index 34d122f58ff32cb47b79ab1348fee3224315d2dd..af7a1eebe6f3d9876a1a730f4ca9b081
BlockState state = Blocks.WITHER_ROSE.defaultBlockState(); BlockState state = Blocks.WITHER_ROSE.defaultBlockState();
if (this.level().getBlockState(pos).isAir() && state.canSurvive(this.level(), pos)) { if (this.level().getBlockState(pos).isAir() && state.canSurvive(this.level(), pos)) {
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
index d9c5d2e1c638370434e52422c9643c3521f1bb42..d5c50e5f5a850995d4636e155e5d51e190b7095c 100644 index 31cb7f27dc114f347b1667a3ad7e99d4ccff8d34..2d74f6f2a47e5dea6b52037a8b6e3766a74f6f82 100644
--- a/net/minecraft/world/entity/Mob.java --- a/net/minecraft/world/entity/Mob.java
+++ b/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java
@@ -566,7 +566,7 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs @@ -572,7 +572,7 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
&& this.canPickUpLoot() && this.canPickUpLoot()
&& this.isAlive() && this.isAlive()
&& !this.dead && !this.dead

8
purpur-server/minecraft-patches/features/0017-API-for-any-mob-to-burn-daylight.patch
View File

@@ -32,7 +32,7 @@ index 241ff14c2c27204fc8615b19700f946afdcfa2d1..6807b1310c70cd50bf8a0c8828a1bb62
this.type = type; this.type = type;
this.level = level; this.level = level;
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index af7a1eebe6f3d9876a1a730f4ca9b0814ed57332..76c520f115ab52b661828813cc15b698aa250021 100644 index c3bf8c3d9e34940c40a0bf453bea3ca4191b2411..215149e07e0ae2a3b98d90336d8adf8d36e2bae0 100644
--- a/net/minecraft/world/entity/LivingEntity.java --- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java
@@ -291,6 +291,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin @@ -291,6 +291,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -98,10 +98,10 @@ index af7a1eebe6f3d9876a1a730f4ca9b0814ed57332..76c520f115ab52b661828813cc15b698
protected void applyInput() { protected void applyInput() {
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
index d5c50e5f5a850995d4636e155e5d51e190b7095c..9867e2ea9af7cf5d6d711742514e222fad55ce41 100644 index 2d74f6f2a47e5dea6b52037a8b6e3766a74f6f82..65473722cf31dd7f298ec60cf0d870d8e8fbe142 100644
--- a/net/minecraft/world/entity/Mob.java --- a/net/minecraft/world/entity/Mob.java
+++ b/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java
@@ -556,9 +556,9 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs @@ -562,9 +562,9 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
@Override @Override
public void aiStep() { public void aiStep() {
super.aiStep(); super.aiStep();
@@ -113,7 +113,7 @@ index d5c50e5f5a850995d4636e155e5d51e190b7095c..9867e2ea9af7cf5d6d711742514e222f
ProfilerFiller profiler = Profiler.get(); ProfilerFiller profiler = Profiler.get();
profiler.push("looting"); profiler.push("looting");
@@ -610,16 +610,8 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs @@ -616,16 +616,8 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
} }
public boolean isSunBurnTick() { public boolean isSunBurnTick() {

6
purpur-server/minecraft-patches/features/0021-Per-mob-mob_griefing-loot-pickup-override.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Per mob mob_griefing loot pickup override
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
index 9867e2ea9af7cf5d6d711742514e222fad55ce41..3c5e2b36df50768367ecb4c97a88833d4327523f 100644 index 65473722cf31dd7f298ec60cf0d870d8e8fbe142..d0187dea97d0a1247d2d03b089cf138035bf6d24 100644
--- a/net/minecraft/world/entity/Mob.java --- a/net/minecraft/world/entity/Mob.java
+++ b/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java
@@ -566,7 +566,7 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs @@ -572,7 +572,7 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
&& this.canPickUpLoot() && this.canPickUpLoot()
&& this.isAlive() && this.isAlive()
&& !this.dead && !this.dead
@@ -17,7 +17,7 @@ index 9867e2ea9af7cf5d6d711742514e222fad55ce41..3c5e2b36df50768367ecb4c97a88833d
Vec3i pickupReach = this.getPickupReach(); Vec3i pickupReach = this.getPickupReach();
for (ItemEntity entity : this.level() for (ItemEntity entity : this.level()
@@ -585,6 +585,12 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs @@ -591,6 +591,12 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
profiler.pop(); profiler.pop();
} }

4
purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch
View File

@@ -61,7 +61,7 @@
// Paper start - allow changing despawnInPeaceful // Paper start - allow changing despawnInPeaceful
this.despawnInPeacefulOverride = readDespawnInPeacefulOverride(input); this.despawnInPeacefulOverride = readDespawnInPeacefulOverride(input);
} }
@@ -1251,7 +_,7 @@ @@ -1257,7 +_,7 @@
); );
} }
@@ -70,7 +70,7 @@
return groupData; return groupData;
} }
@@ -1608,6 +_,7 @@ @@ -1614,6 +_,7 @@
} }
this.postPiercingAttack(); this.postPiercingAttack();