Reverting 0 damage fix
Merge pull request #407 from Fuzzysqurl/master

Reverting 0 damage fix
Merge remote-tracking branch 'main/master'

Conflicts:
	src/Server/battle.cpp