lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor Attackable class cleanup.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-01-06 21:18:55 +00:00
parent e4d6b3190f
commit eb59d00dac
25 changed files with 121 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -512,13 +512,10 @@ public class Attackable extends Npc
}
setChampion(false);
if (Config.CHAMPION_ENABLE)
// Set champion on next spawn.
if (Config.CHAMPION_ENABLE && !(this instanceof GrandBoss) && !(this instanceof RaidBoss) && (this instanceof Monster) /* && !getTemplate().isQuestMonster */ && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LEVEL) && (getLevel() <= Config.CHAMP_MAX_LEVEL) && (Rnd.get(100) < Config.CHAMPION_FREQUENCY))
{
// Set champion on next spawn.
if (!(this instanceof GrandBoss) && !(this instanceof RaidBoss) && (this instanceof Monster) /* && !getTemplate().isQuestMonster */ && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LEVEL) && (getLevel() <= Config.CHAMP_MAX_LEVEL) && (Rnd.get(100) < Config.CHAMPION_FREQUENCY))
{
setChampion(true);
}
setChampion(true);
}
return true;
@@ -2190,10 +2187,8 @@ public class Attackable extends Npc
return;
}
final int maxAbsorbLevel = getAbsorbLevel();
int minAbsorbLevel = 0;
// If this is not a valid Attackable, clears the _absorbersList and just return
final int maxAbsorbLevel = getAbsorbLevel();
if (maxAbsorbLevel == 0)
{
resetAbsorbList();
@@ -2201,6 +2196,7 @@ public class Attackable extends Npc
}
// All boss mobs with maxAbsorbLevel 13 have minAbsorbLevel of 12 else 10
int minAbsorbLevel = 0;
if (maxAbsorbLevel > 10)
{
minAbsorbLevel = maxAbsorbLevel > 12 ? 12 : 10;
@@ -2547,8 +2543,7 @@ public class Attackable extends Npc
final double overhitExp = (overhitPercentage / 100) * normalExp;
// Return the rounded ammount of exp points to be added to the player's normal exp reward
final long bonusOverhit = Math.round(overhitExp);
return bonusOverhit;
return Math.round(overhitExp);
}
@Override