Added Granite, Diorite and Andesite to the NaturalPatches generator.
Fixed compilation
Make endermen take damage in water
Fix comments
Derp
Merge pull request #1478 from doublej472/master

Make endermen take damage in water
Merge pull request #1473 from mc-server/NewStoneGeneration

Added Granite, Diorite and Andesite to the NaturalPatches generator.
Added torches placeable on upside-down-halfslaps
Update BlockTorch.h
Merge pull request #1479 from SphinxC0re/master

Added torches placeable on upside-down-halfslabs
Plugin messages: Vanilla prefixes its payloads with VarInt lengths.
stone: ConvertToPickups() supports Granite, Diorite and Andesite now.

Signed-off-by: netchip <w00tc0d3@outlook.com>
Merge branch 'master' of github.com:w00tc0d3/MCServer
Merge remote-tracking branch 'upstream/master'