Revert spawning logic to match CraftBukkit