Merge branch '3.5'

This commit is contained in:
Dylan K. Taylor
2019-01-23 16:48:12 +00:00
3 changed files with 15 additions and 11 deletions

View File

@ -579,7 +579,9 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
}
public function getXpDropAmount() : int{
return (int) min(100, $this->getCurrentTotalXp());
//this causes some XP to be lost on death when above level 1 (by design), dropping at most enough points for
//about 7.5 levels of XP.
return (int) min(100, 7 * $this->getXpLevel());
}
public function getInventory(){