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

SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime

Browse Source 
By: LoliColleen <76620594+LoliColleen@users.noreply.github.com>
This commit is contained in:
CraftBukkit/Spigot
2024-03-17 11:39:04 +11:00
parent 434aec3832
commit 13b4e915a0
3 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/nms-patches/net/minecraft/world/entity/player/EntityHuman.patch
View File

@@ -235,7 +235,7 @@
+ // CraftBukkit start
@Override
- protected void actuallyHurt(DamageSource damagesource, float f) {
+ protected boolean actuallyHurt(DamageSource damagesource, float f) { // void -> boolean
+ protected float actuallyHurt(final DamageSource damagesource, float f) { // void -> float, returned value means the final damage
+ if (true) {
+ return super.actuallyHurt(damagesource, f);
+ }
@@ -256,7 +256,7 @@
this.gameEvent(GameEvent.ENTITY_DAMAGE);
}
}
+ return false; // CraftBukkit
+ return 0; // CraftBukkit
}
@Override