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@77c763b Fix PlayerShearBlockEvent drops ignored for Pumpkin (#10956)
PaperMC/Paper@76c2f16 Fix wrong diff applying delta twice (#10959)
This commit is contained in:
granny
2024-06-22 19:19:32 -07:00
parent 21ec259c5d
commit 9efd5fcda1
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0006-Ridables.patch
View File

@@ -79,7 +79,7 @@ index 7796e191747be545e744564a2b0b65790f69114d..82f60de72bc0f9b01eb97dbc0e296e80
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 9e5eda675411916f40a82d7c60e488cf790381e3..f332458dbc26bb0e77ca9b7446f4ae800c359d13 100644
index 43a42cc5fc6739f3e0a15ac233b96efd4604b382..0fede48747fcc4c0674f25feec7a4173292c2fe6 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
@@ -91,7 +91,7 @@ index 9e5eda675411916f40a82d7c60e488cf790381e3..f332458dbc26bb0e77ca9b7446f4ae80
private float eyeHeight;
public boolean isInPowderSnow;
public boolean wasInPowderSnow;
@@ -2964,6 +2964,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -2963,6 +2963,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.passengers = ImmutableList.copyOf(list);
}
@@ -105,7 +105,7 @@ index 9e5eda675411916f40a82d7c60e488cf790381e3..f332458dbc26bb0e77ca9b7446f4ae80
this.gameEvent(GameEvent.ENTITY_MOUNT, passenger);
}
}
@@ -3003,6 +3010,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3002,6 +3009,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return false;
}
// CraftBukkit end
@@ -120,7 +120,7 @@ index 9e5eda675411916f40a82d7c60e488cf790381e3..f332458dbc26bb0e77ca9b7446f4ae80
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -4834,4 +4849,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4833,4 +4848,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end - Expose entity id counter
@@ -5025,7 +5025,7 @@ index 0af34e0f9c9696fbcb11b12fb27472ef17ad532a..d514faecb9e6b244aa043383fa072316
this.openTradingScreen(player, this.getDisplayName(), 1);
}
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 0526f4c701b4d945f26c5f382e9efac86cc568fa..0f7c4e39d5569c8f6387bc003d29d4b7d59d77e0 100644
index 3f397423f023deaf4d8545201088b23ee3cc1cdd..16e7959eb8a87b110e0cfe731a5055af765fad6a 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -207,6 +207,19 @@ public abstract class Player extends LivingEntity {