mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 09:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: 5059ada Move log message for named entity deaths into correct location (#6105) b5be382 Add methods to ProtoWorld for working with BlockStates (#5929) 144e5f7 Add option for logging named entity deaths (#6107) 4aef035 [ci skip] Use Java toolchain for run tasks (#6108) dafc064 Fix MobEffectArgument#getEffect reobf 648f607 Route sign run_command click events through normal chat logic (#6109) 351a2c3 Drop no longer needed patch (#6115) bb44da8 Fix cancelling EntityPickupItemEvent for villagers (#6091)
This commit is contained in:
@@ -29,7 +29,7 @@ index eea15d795475b79994c1b6ba55e862399831f960..f3304cefa0a8862ef27dcb00519a8a3b
|
||||
// Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index 2ece26f762f9764db27bea60b63f2121d1fd4211..85d9e1d485699c375e888503b71910b39afc6988 100644
|
||||
index 420a3ca6daab141a541f35154f7d7e65bed8ea54..124cee713c3a808bd9c52f105a38ce71b6c9b423 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -265,6 +265,7 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -60,7 +60,7 @@ index 2ece26f762f9764db27bea60b63f2121d1fd4211..85d9e1d485699c375e888503b71910b3
|
||||
}
|
||||
|
||||
// CraftBukkit start
|
||||
@@ -3301,6 +3308,27 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -3304,6 +3311,27 @@ public abstract class LivingEntity extends Entity {
|
||||
this.hurt(DamageSource.DROWN, 1.0F);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user