Merge branch 'master' of github.com:modernuo/ModernUO into develop

This commit is contained in:
Kamron Batman 2020-01-09 00:43:20 -08:00
commit 21511b1c60
No known key found for this signature in database
GPG key ID: 5C9DFD15804B6BB8
21 changed files with 471 additions and 371 deletions

View file

@ -1420,7 +1420,7 @@ namespace Server.Items
}
}
public virtual double GetAosDamage(Mobile attacker, int bonus, int dice, int sides)
public virtual double GetAosDamage(Mobile attacker, int bonus, uint dice, uint sides)
{
int damage = Utility.Dice(dice, sides, bonus) * 100;
int damageBonus = 0;
@ -1449,7 +1449,7 @@ namespace Server.Items
damage = AOS.Scale(damage, 100 + damageBonus);
return damage / 100;
return damage / 100.0;
}
public virtual CheckSlayerResult CheckSlayers(Mobile attacker, Mobile defender)