Refactor code, blocking movement
Merge pull request #4 from adrianblp/PvP-and-blocking-movement

Refactor code, blocking movement