diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b3da75ef54..c2f38d0a06 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -850,4 +850,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         getHandle().abilities.canFly = value;
         getHandle().updateAbilities();
     }
+
+    @Override
+    public int getNoDamageTicks() {
+        if (getHandle().invulnerableTicks > 0) {
+            return Math.max(getHandle().invulnerableTicks, getHandle().noDamageTicks);
+        } else {
+            return getHandle().noDamageTicks;
+        }
+    }
 }