SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-7604: Revert "SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime"

Browse Source 
This reverts commit 13b4e915a0.

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-03-20 20:31:48 +11:00
parent 13b4e915a0
commit 0223e7ff73
3 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/nms-patches/net/minecraft/world/entity/animal/camel/Camel.patch
View File

@@ -14,10 +14,10 @@
@Override
- protected void actuallyHurt(DamageSource damagesource, float f) {
+ // CraftBukkit start - void -> float, returned value means the final damage
+ protected float actuallyHurt(final DamageSource damagesource, float f) {
+ float hurt = super.actuallyHurt(damagesource, f);
+ if (hurt <= 0) {
+ // CraftBukkit start - void -> boolean
+ protected boolean actuallyHurt(DamageSource damagesource, float f) {
+ boolean hurt = super.actuallyHurt(damagesource, f);
+ if (!hurt) {
+ return hurt;
+ }
+ // CraftBukkit end