Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17: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@fcedb49 Update spark-paper
PaperMC/Paper@956b3d1 Ensure MaterialChoice materials are items (#11325)
PaperMC/Paper@5625051 Prevent duplicate pickup event for piglins (#11322)
PaperMC/Paper@94444ce Fix incorrect timestamp in region file header recalculation (#11318)
PaperMC/Paper@5b2c43e Remove set damage lootable item function from compasses (#11317)
PaperMC/Paper@5167856 Fix despawn ranges by defaulting to an ellipsoid shape (#11312)
PaperMC/Paper@e2da65c Deprecate API relating to menu title changes (#11309)
PaperMC/Paper@ad4c524 Properly destroy placed blocks on the end platform (#11292)
PaperMC/Paper@374d9c8 Add a method to reset Lodestone compasses back to normal ones (#11308)
PaperMC/Paper@dd8c70a Ensure TabCompleteEvent always has a mutable backing list. (#11302)
PaperMC/Paper@a7b8d95 Add enchantment seed update API (#11282)
PaperMC/Paper@789a267 Re-implement maxLeashDistance world conf and call missing event (#11301)
This commit is contained in:
granny
2024-08-25 16:07:56 -07:00
parent ef12ede0a3
commit a61db94175
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/build.gradle.kts b/build.gradle.kts
index 421f6b3dc8890d63d2e7aa774d0bf8f7e15890ab..fd1ac5dbc39068d4332fd264f3359e4845e529e1 100644
index 3588770a9ea6ee0a9508b218758650f43d994715..181784e18cd321f959845abdc0982e934f67a702 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -1425,7 +1425,7 @@ index b13057c0792067cc6b0abdf0d64a9be2cc9389a4..427ac2a5e90ad80328a07af27552b6b3
final io.papermc.paper.configuration.type.number.IntOr.Disabled pageMax = io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.pageMax;
if (!this.cserver.isPrimaryThread() && pageMax.enabled()) {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 490ee48346395fcbaf2eb0151e9248f18974fea6..3f7812c55dae82433336d6e091aa83434615fa04 100644
index e0827d8bb3fa17d4f590a5342ff41a514f623e68..de5276b9ba5b3cd2f565714995e86edd4447c1ca 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -429,6 +429,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1634,7 +1634,7 @@ index ccd9dff20a60f019e0c320acfb526b8bf3e5f806..ce0d28cafcae0b7edc861749a1652ecc
if (this.isSpectator()) {
return false;
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index f36a814bfd90af6457171512c131601b19905737..16fbbfd47c494d9fdea844cdb767dd9f6fe5e171 100644
index 763abeea3f14f15c27d600e0bdae44b387687bb4..1f3a55d34f58964fb1f642ad59c9d7b7aa6fa4ff 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -232,14 +232,16 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1656,7 +1656,7 @@ index f36a814bfd90af6457171512c131601b19905737..16fbbfd47c494d9fdea844cdb767dd9f
this.targetSelector.tick();
}
}
@@ -932,16 +934,20 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -929,16 +931,20 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
if (i % 2 != 0 && this.tickCount > 1) {
gameprofilerfiller.push("targetSelector");