mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 15:30:19 +01:00
d1a72eac31
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 1fc1020a PR-1049: Add MenuType API 8ae2e3be PR-1055: Expand riptiding API cac68bfb SPIGOT-7890: AttributeModifier#getUniqueId() doesn't match the UUID passed to its constructor 7004fcf2 SPIGOT-7886: Fix mistake in AttributeModifier UUID shim 1ac7f950 PR-1054: Add FireworkMeta#hasPower 4cfb565f SPIGOT-7873: Add powered state for skulls CraftBukkit Changes: bbb30e7a8 SPIGOT-7894: NPE when sending tile entity update ba21e9472 SPIGOT-7895: PlayerItemBreakEvent not firing 0fb24bbe0 SPIGOT-7875: Fix PlayerItemConsumeEvent cancellation causing client-side desync 815066449 SPIGOT-7891: Can't remove second ingredient of MerchantRecipe 45c206f2c PR-1458: Add MenuType API 19c8ef9ae SPIGOT-7867: Merchant instanceof AbstractVillager always returns false 4e006d28f PR-1468: Expand riptiding API bd8aded7d Ignore checks in CraftPlayerProfile for ResolvableProfile used in profile components 8679620b5 SPIGOT-7889: Fix tool component deserialisation without speed and/or correct-for-drops 8d5222691 SPIGOT-7882, PR-1467: Fix conversion of name in Profile Component to empty if it is missing 63f91669a SPIGOT-7887: Remove duplicate ProjectileHitEvent for fireballs 7070de8c8 SPIGOT-7878: Server#getLootTable does not return null on invalid loot table 060ee6cae SPIGOT-7876: Can't kick player or disconnect player in PlayerLoginEvent when checking for cookies 7ccb86cc0 PR-1465: Add FireworkMeta#hasPower 804ad6491 SPIGOT-7873: Add powered state for skulls f9610cdcb Improve minecart movement Spigot Changes: a759b629 Rebuild patches Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
73 lines
3.8 KiB
Diff
73 lines
3.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Bjarne Koll <lynxplay101@gmail.com>
|
|
Date: Mon, 8 Jul 2024 22:01:08 +0200
|
|
Subject: [PATCH] Only call EntityDamageEvents before actuallyHurt
|
|
|
|
The recent upstream update moved around the event logic for
|
|
EntiyDamageEvent and its derivatives.
|
|
However, the event was called on every call to #hurt as it was moved out
|
|
of actuallyHurt.
|
|
|
|
This patch moves the invocation directly before the #actuallyHurt calls,
|
|
respective invulnerable timings.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index 3b15995efc65a351da8dac009b9698494771fefb..5079775ce8f86fb061e616190513f56ff086e409 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -1459,12 +1459,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
}
|
|
|
|
// CraftBukkit start
|
|
- EntityDamageEvent event = this.handleEntityDamage(source, amount);
|
|
- amount = 0;
|
|
- amount += (float) event.getDamage(DamageModifier.BASE);
|
|
- amount += (float) event.getDamage(DamageModifier.BLOCKING);
|
|
- amount += (float) event.getDamage(DamageModifier.FREEZING);
|
|
- amount += (float) event.getDamage(DamageModifier.HARD_HAT);
|
|
+ EntityDamageEvent event; // Paper - move this into the actual invuln check....
|
|
// CraftBukkit end
|
|
|
|
this.walkAnimation.setSpeed(1.5F);
|
|
@@ -1475,6 +1470,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
return false;
|
|
}
|
|
|
|
+ // Paper start - only call damage event when actuallyHurt will be called - move call logic down
|
|
+ event = this.handleEntityDamage(source, amount);
|
|
+ amount = computeAmountFromEntityDamageEvent(event);
|
|
+ // Paper end - only call damage event when actuallyHurt will be called - move call logic down
|
|
+
|
|
// CraftBukkit start
|
|
if (!this.actuallyHurt(source, (float) event.getFinalDamage() - this.lastHurt, event)) {
|
|
return false;
|
|
@@ -1484,6 +1484,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
this.lastHurt = amount;
|
|
flag1 = false;
|
|
} else {
|
|
+ // Paper start - only call damage event when actuallyHurt will be called - move call logic down
|
|
+ event = this.handleEntityDamage(source, amount);
|
|
+ amount = computeAmountFromEntityDamageEvent(event);
|
|
+ // Paper end - only call damage event when actuallyHurt will be called - move call logic down
|
|
// CraftBukkit start
|
|
if (!this.actuallyHurt(source, (float) event.getFinalDamage(), event)) {
|
|
return false;
|
|
@@ -1615,6 +1619,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
}
|
|
}
|
|
|
|
+ // Paper start - only call damage event when actuallyHurt will be called - move out amount computation logic
|
|
+ private float computeAmountFromEntityDamageEvent(final EntityDamageEvent event) {
|
|
+ // Taken from hurt()'s craftbukkit diff.
|
|
+ float amount = 0;
|
|
+ amount += (float) event.getDamage(DamageModifier.BASE);
|
|
+ amount += (float) event.getDamage(DamageModifier.BLOCKING);
|
|
+ amount += (float) event.getDamage(DamageModifier.FREEZING);
|
|
+ amount += (float) event.getDamage(DamageModifier.HARD_HAT);
|
|
+ return amount;
|
|
+ }
|
|
+ // Paper end - only call damage event when actuallyHurt will be called - move out amount computation logic
|
|
+
|
|
protected void blockUsingShield(LivingEntity attacker) {
|
|
attacker.blockedByShield(this);
|
|
}
|