9
0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-23 08:49:25 +00:00

Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@eef40b7 Configurable Entity Despawn Time (#11454)
PaperMC/Paper@edabff8 Correctly damage tick wolf after armor block (#11653)
PaperMC/Paper@6051dac Painting variant registry modification API (#11648)
PaperMC/Paper@bb32b05 Call ProjectileHitEvent for entity hits (#11652)
PaperMC/Paper@bf8405f [ci skip] Rebuild patches
This commit is contained in:
Samsuik
2024-11-24 17:57:49 +00:00
parent 29fb4996e5
commit 877990205f
15 changed files with 53 additions and 53 deletions

View File

@@ -21,10 +21,10 @@ index e39f4e4716b8794e506d3ffcbc35ae88d0fbc23a..a3c8ed82e46056be1a3ca002664e6fe6
} else { entity.inactiveTick(); } // Paper - EAR 2
gameprofilerfiller.pop();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index ef81c093377c0cae5d729a17a0dc89ba9b0b118a..ee8816ec238a38667cdf0f0f749c02b78a6477bd 100644
index 7a07be8dfabde5ab99c354bc7aef29fcf551c9e1..344c2bac7fc694e84532cd384be32e7d259e8130 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -681,6 +681,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -682,6 +682,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return this.physics;
}
// Sakura end - physics version api
@@ -44,7 +44,7 @@ index ef81c093377c0cae5d729a17a0dc89ba9b0b118a..ee8816ec238a38667cdf0f0f749c02b7
public Entity(EntityType<?> type, Level world) {
this.id = Entity.ENTITY_COUNTER.incrementAndGet();
@@ -733,6 +746,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -735,6 +748,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.entityData = datawatcher_a.build();
this.setPos(0.0D, 0.0D, 0.0D);
this.eyeHeight = this.dimensions.eyeHeight();