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

Olympiad game addDamage when not invulnerable.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-11-13 22:48:46 +00:00
parent f6302f520d
commit c61ea3f137
21 changed files with 297 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java
View File

@ -684,19 +684,28 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
}
@Override
protected final void addDamage(PlayerInstance player, int damage)
protected void addDamage(PlayerInstance player, int damage)
{
if ((_playerOne.getPlayer() == null) || (_playerTwo.getPlayer() == null))
final PlayerInstance player1 = _playerOne.getPlayer();
final PlayerInstance player2 = _playerOne.getPlayer();
if ((player1 == null) || (player2 == null))
{
return;
}
if (player == _playerOne.getPlayer())
if (player == player1)
{
_damageP1 += damage;
if (!player2.isInvul() && !player2.isHpBlocked())
{
_damageP1 += damage;
}
}
else if (player == _playerTwo.getPlayer())
else if (player == player2)
{
_damageP2 += damage;
if (!player1.isInvul() && !player1.isHpBlocked())
{
_damageP2 += damage;
}
}
}