diff --git a/src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java b/src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java index a54e637c3..d818da739 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java @@ -52,6 +52,10 @@ public class TrackedTamingEntity extends BukkitRunnable { CombatUtils.dealDamage(livingEntity, livingEntity.getMaxHealth(), DamageCause.SUICIDE, livingEntity); } + if (!UserManager.hasPlayerDataKey(owner)) { + return; + } + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(owner); TamingManager tamingManager = mcMMOPlayer.getTamingManager();