Obj #147

Merged r-isitani merged 2 commits into nitta-lab-2018:master from nitta-lab-2018:obj on 24 Oct 2018
Showing 2 changed files
View
src/main/java/cactusServer/entities/MovableObject.java
View
src/main/java/cactusServer/entities/Player.java