Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +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@abf6b6c2 Allow replace effects in Consumable Component Builder (#12938)
PaperMC/Paper@3d1425f0 Fix phantoms failing to target players near non-insomniacs (#12953)
PaperMC/Paper@4fe66e58 Fix lead_break sound playing after cancelling EntityUnleashEvent (#12944)
This commit is contained in:
granny
2025-08-12 15:36:04 -07:00
parent 710ecf5ec5
commit 4fd4df0799
4 changed files with 7 additions and 7 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.8-R0.1-SNAPSHOT version = 1.21.8-R0.1-SNAPSHOT
mcVersion = 1.21.8 mcVersion = 1.21.8
paperCommit = a664311f0fb2643e45e2ef8aa7683af94f75ea14 paperCommit = 4fe66e5800114214249c4e64a4ee74b3847e39a2
org.gradle.configuration-cache = true org.gradle.configuration-cache = true
org.gradle.caching = true org.gradle.caching = true

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

@@ -3841,7 +3841,7 @@ index 889c31cc9257fbbd5df8325ccee9ce39b026ec4b..4a1299d6cee2807522de0c2d0d4745c5
@Override @Override
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
index 2abb55d84507fd29817760cb0068dd083f7f1c37..855ec37a7e4110e37823ecf62f67f5cb3714f4bf 100644 index dd808ce350aa8755df69a84ba5e779f82a76a960..1a2c31932dadddcdf882d3c727c55785b015239d 100644
--- a/net/minecraft/world/entity/monster/Phantom.java --- a/net/minecraft/world/entity/monster/Phantom.java
+++ b/net/minecraft/world/entity/monster/Phantom.java +++ b/net/minecraft/world/entity/monster/Phantom.java
@@ -62,6 +62,52 @@ public class Phantom extends Mob implements Enemy { @@ -62,6 +62,52 @@ public class Phantom extends Mob implements Enemy {
@@ -3941,7 +3941,7 @@ index 2abb55d84507fd29817760cb0068dd083f7f1c37..855ec37a7e4110e37823ecf62f67f5cb
} }
@Override @Override
@@ -419,25 +478,42 @@ public class Phantom extends Mob implements Enemy { @@ -420,25 +479,42 @@ public class Phantom extends Mob implements Enemy {
} }
} }

4
purpur-server/minecraft-patches/features/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -72,7 +72,7 @@ index 5bff703ae4f95091620dec5347246d7c0cbe5d5e..220a828717e1933a44c5282b56713ba0
@Override @Override
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
index e35d1e91c1300d8f7d14a5cfa54c404c9f21184d..1d7432bcce99c893a1f6e4a02d0cad65c0d6d3a4 100644 index 4d49d8c473319a9ca43a5163b632c72623e79f93..029d90b7ef1dfe264ef873af133e7ac5334b1740 100644
--- a/net/minecraft/world/entity/monster/Phantom.java --- a/net/minecraft/world/entity/monster/Phantom.java
+++ b/net/minecraft/world/entity/monster/Phantom.java +++ b/net/minecraft/world/entity/monster/Phantom.java
@@ -49,6 +49,7 @@ public class Phantom extends Mob implements Enemy { @@ -49,6 +49,7 @@ public class Phantom extends Mob implements Enemy {
@@ -128,7 +128,7 @@ index e35d1e91c1300d8f7d14a5cfa54c404c9f21184d..1d7432bcce99c893a1f6e4a02d0cad65
this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
this.targetSelector.addGoal(1, new Phantom.PhantomAttackPlayerTargetGoal()); this.targetSelector.addGoal(1, new Phantom.PhantomAttackPlayerTargetGoal());
} }
@@ -514,6 +540,124 @@ public class Phantom extends Mob implements Enemy { @@ -515,6 +541,124 @@ public class Phantom extends Mob implements Enemy {
} }
} }

4
purpur-server/minecraft-patches/features/0011-Phantoms-burn-in-light.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms burn in light
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
index 1d7432bcce99c893a1f6e4a02d0cad65c0d6d3a4..5b2018019f6ec9e91357d46dd66865e2f232507a 100644 index 029d90b7ef1dfe264ef873af133e7ac5334b1740..7f3ac34023fe5232d53157e9fade56ffd0597c28 100644
--- a/net/minecraft/world/entity/monster/Phantom.java --- a/net/minecraft/world/entity/monster/Phantom.java
+++ b/net/minecraft/world/entity/monster/Phantom.java +++ b/net/minecraft/world/entity/monster/Phantom.java
@@ -55,6 +55,7 @@ public class Phantom extends Mob implements Enemy { @@ -55,6 +55,7 @@ public class Phantom extends Mob implements Enemy {
@@ -37,7 +37,7 @@ index 1d7432bcce99c893a1f6e4a02d0cad65c0d6d3a4..5b2018019f6ec9e91357d46dd66865e2
if (!nearbyPlayers.isEmpty()) { if (!nearbyPlayers.isEmpty()) {
nearbyPlayers.sort(Comparator.<Player, Double>comparing(Entity::getY).reversed()); nearbyPlayers.sort(Comparator.<Player, Double>comparing(Entity::getY).reversed());
@@ -744,6 +750,12 @@ public class Phantom extends Mob implements Enemy { @@ -745,6 +751,12 @@ public class Phantom extends Mob implements Enemy {
return false; return false;
} else if (!target.isAlive()) { } else if (!target.isAlive()) {
return false; return false;