Combat Changes

Faster mobs, slightly more knockback from player weapons, faster charge
time for player weapons, removed two NPE crashes related to combat,
allowed players to attack through water