diff options
| author | Jake Potrebic <[email protected]> | 2024-05-21 13:24:56 -0700 |
|---|---|---|
| committer | Jake Potrebic <[email protected]> | 2024-06-12 15:23:00 -0700 |
| commit | 3693757283d1ad5264d9114faf999866d60f86d7 (patch) | |
| tree | 3b902f575ea53e7e1f0894333899863d8006214b /patches/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch | |
| parent | 906df69f05d0779906377abb809bfec9fc3c3546 (diff) | |
| download | Paper-3693757283d1ad5264d9114faf999866d60f86d7.tar.gz Paper-3693757283d1ad5264d9114faf999866d60f86d7.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot)
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:
def44cbf SPIGOT-7669: Fix typo in ProjectileHitEvent#getHitBlockFace documentation
53fa4f72 PR-1011: Throw an exception if a RecipeChoice is ever supplied air
CraftBukkit Changes:
87d0a3368 SPIGOT-7668: Move NONE Registry updater to FieldRename to avoid some class loader issues
2ea1e7ac2 PR-1399: Fix regression preventing positive .setDamage value from causing knockback for 0 damage events
ba2d49d21 Increase outdated build delay
Spigot Changes:
342f4939 SPIGOT-7661: Add experimental unload-frozen-chunks option
Diffstat (limited to 'patches/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch')
| -rw-r--r-- | patches/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch index 10c16af7b7..1013713e9f 100644 --- a/patches/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/patches/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8c95f08302439c7bd36ae9834ea991b29c435cfa..166502bdeb4e20a122c023935f48047debc69bbd 100644 +index 2b38a9d88b459674b1b8d667c4e02b93ad7290b4..accb574f961114f225596a633b36a91e3009ed87 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2254,7 +2254,16 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2248,7 +2248,16 @@ public abstract class LivingEntity extends Entity implements Attackable { EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, hardHatModifier, blockingModifier, armorModifier, resistanceModifier, magicModifier, absorptionModifier, hardHat, blocking, armor, resistance, magic, absorption); if (damagesource.getEntity() instanceof net.minecraft.world.entity.player.Player) { |