mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-23 00:39:20 +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:
@@ -71,10 +71,10 @@ index 0000000000000000000000000000000000000000..05e532f0aa3b1a5ab6570432662a8142
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index 9adc5164580a291585789948091ec192aff6d968..f3222939d68fbfe5e134b2484dfa9936605f1e0c 100644
|
||||
index 5067db32a3e024a27c1da8f76a0abade6f20096d..3e6733b3195019f0090ae67136bbcf8467b8333a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -2086,6 +2086,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
@@ -2094,6 +2094,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
}
|
||||
final Iterator iterator1 = positions.iterator();
|
||||
// Sakura end - physics version api
|
||||
@@ -86,7 +86,7 @@ index 9adc5164580a291585789948091ec192aff6d968..f3222939d68fbfe5e134b2484dfa9936
|
||||
|
||||
while (iterator1.hasNext()) {
|
||||
BlockPos blockposition = (BlockPos) iterator1.next();
|
||||
@@ -2094,7 +2099,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
@@ -2102,7 +2107,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user