3 commits

Author	SHA1	Message	Date
Zach Brown	12310fa5f3	Update upstream B/CB/S	2017-02-17 20:03:38 -06:00
Aikar	3734a3acdb	Fix build ... I totally didn't notice that the patch had a conflict >_>	2017-01-02 02:05:02 -05:00
Aikar	0b26bbd451	handle NaN health/absorb values and repair bad data ... Undoes damage from Damage API bugs	2016-03-20 00:35:02 -04:00