fixed entity spawning on block hit
merge conflicts resolved