Added spawn protection