mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 02:17:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b0ef3ca Only call EntityDamageEvents before actuallyHurt (#11045) PaperMC/Paper@20889d0 Fix method reflection remapping with null parameter types passed
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index 995cb702af3e3f22d836604db98b333a4939de46..e38c137fbe90f0d024a87031a5610aacbca56c70 100644
|
||||
index 24d738cf82dc57819064319ad3a9d892167665cc..25915e9e24fc370dac496b7eae6d2f5ac2a0c4c6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -1651,6 +1651,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||||
@@ -1667,6 +1667,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user