@ -69,7 +69,8 @@ public class AttackCmdMsgHandler extends AbstractClientMsgHandler {
return true; // cannot attack a null target
}
if (playerCharacter.isCombat() && playerCharacter.getCombatTarget().equals(target)) {
if (playerCharacter.isCombat() && playerCharacter.getCombatTarget() != null &&
playerCharacter.getCombatTarget().equals(target)) {
Logger.info("Bypass");
return true;