The entity and block pickup now works as it should.

Signed-off-by: Lucas Arnström <lucasarstrom@gmail.com>