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@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/0009-Ridables.patch
View File

@@ -79,7 +79,7 @@ index 427ac2a5e90ad80328a07af27552b6b380c8f3f1..8345c9b767d9dabbaeb8bcc09cefd3a2
if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
entity.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 9dd838972d83196dfda620b223ea17fbf7c125a4..5d2d310da657963b830efa7de2486180736613f0 100644
index e2907879dbe758ffe728d77ebde434b1e7382a96..cdd289a8a7e2560765c2e873e9d7eb698c9df273 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -383,7 +383,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -259,7 +259,7 @@ index ce0d28cafcae0b7edc861749a1652ecc08d298b5..e7b9f129a31c57df65e9be082de1d2f3
// Paper end - Add EntityMoveEvent
if (!this.level().isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 16fbbfd47c494d9fdea844cdb767dd9f6fe5e171..b45cefa0455ee5634b0b719bf93f7ab728d63eb0 100644
index 1f3a55d34f58964fb1f642ad59c9d7b7aa6fa4ff..ebf2541c0d17c0940d78162a4015145bbebc51cf 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -160,8 +160,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -273,7 +273,7 @@ index 16fbbfd47c494d9fdea844cdb767dd9f6fe5e171..b45cefa0455ee5634b0b719bf93f7ab7
this.jumpControl = new JumpControl(this);
this.bodyRotationControl = this.createBodyControl();
this.navigation = this.createNavigation(world);
@@ -1517,7 +1517,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1514,7 +1514,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
protected void onOffspringSpawnedFromEgg(Player player, Mob child) {}
protected InteractionResult mobInteract(Player player, InteractionHand hand) {
@@ -282,7 +282,7 @@ index 16fbbfd47c494d9fdea844cdb767dd9f6fe5e171..b45cefa0455ee5634b0b719bf93f7ab7
}
public boolean isWithinRestriction() {
@@ -1815,4 +1815,56 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1812,4 +1812,56 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
return itemmonsteregg == null ? null : new ItemStack(itemmonsteregg);
}