Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

TacoSpigot Fix incorrect getNoDamageTicks patch

Browse Source
This commit is contained in:
FatSaw
2022-07-31 05:58:53 +03:00
parent 936cf720f4
commit b46cddd84d
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@@ -1488,11 +1488,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override @Override
public int getNoDamageTicks() { public int getNoDamageTicks() {
if (getHandle().invulnerableTicks > 0) { // TacoSpigot start - fix incorrect calculation of getNoDamageTicks
return Math.max(getHandle().invulnerableTicks, getHandle().noDamageTicks); /*
} else { if (getHandle().invulnerableTicks > 0) {
return getHandle().noDamageTicks; return Math.max(getHandle().invulnerableTicks, getHandle().noDamageTicks);
} } else {
return getHandle().noDamageTicks;
}
*/
return Math.max(getHandle().invulnerableTicks, Math.max(0, getHandle().noDamageTicks - (getHandle().maxNoDamageTicks >> 1)));
// TacoSpigot end
} }
@Override @Override