Call resetCooldown before disabling pvp on death.
splash potions affect players they should, and not players they shouldn't
Call resetCooldown before disabling pvp on death.
splash potions affect players they should, and not players they shouldn't
merged PR