Added a setFire and extinguishFire method to the Player class. Obviously you would know what those do, hopefully.
Merge remote-tracking branch 'origin/1.6.1' into 1.6.1