Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 10:18:16 +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@f7a1344 Improve PortalEvents (#8679)
PaperMC/Paper@e498dda Add missing EntityChangeBlockEvent (#8696)
This commit is contained in:
BillyGalbreath
2022-12-18 15:46:43 -06:00
parent 07afb7204e
commit 278eebff54
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0008-Ridables.patch
View File

@@ -87,7 +87,7 @@ index 662c43401bf84a6de47986e66e1f83c4b50df775..d89e7697f12f06f49d4063fa0b06c90a
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.getEntityData().resendPossiblyDesyncedEntity(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 164fa910866c876abe96910af7b9018b6f1a7452..129e9f79930f03295d1bfaf53333e1a9863b4bc8 100644
index 37f1e4aa89da81fcae2d38bb741f3386950bdf51..76ad4045dc84b42da4d808a912125d619b594739 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -361,7 +361,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -127,7 +127,7 @@ index 164fa910866c876abe96910af7b9018b6f1a7452..129e9f79930f03295d1bfaf53333e1a9
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -4634,4 +4648,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4641,4 +4655,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end