From c61ea3f137daa73420270ee35a90b03ae611e994 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 13 Nov 2020 22:48:46 +0000 Subject: [PATCH] Olympiad game addDamage when not invulnerable. --- .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGame.java | 11 ++++++++-- .../model/olympiad/OlympiadGame.java | 11 ++++++++-- .../model/olympiad/OlympiadGame.java | 11 ++++++++-- .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ .../model/olympiad/OlympiadGameNormal.java | 21 +++++++++++++------ 21 files changed, 297 insertions(+), 114 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 53b9c7ff31..dfea1427dc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -678,19 +678,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; + } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 2d8b17878c..280c82e54f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -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; + } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 2d8b17878c..280c82e54f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -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; + } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e600f07db7..5265d0ddf4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -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; + } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e600f07db7..5265d0ddf4 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -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; + } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e600f07db7..5265d0ddf4 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -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; + } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e600f07db7..5265d0ddf4 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -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; + } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e600f07db7..5265d0ddf4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -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; + } } } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 1567ce6ca5..a14318ba51 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -678,19 +678,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; + } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index c6427e7639..fd1459603f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -918,13 +918,20 @@ class OlympiadGame { return; } + if (player == _playerOne) { - _damageP1 += damage; + if (!_playerTwo.isInvul()) + { + _damageP1 += damage; + } } else if (player == _playerTwo) { - _damageP2 += damage; + if (!_playerOne.isInvul()) + { + _damageP2 += damage; + } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index 9599c8375f..6eef315744 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -918,13 +918,20 @@ class OlympiadGame { return; } + if (player == _playerOne) { - _damageP1 += damage; + if (!_playerTwo.isInvul()) + { + _damageP1 += damage; + } } else if (player == _playerTwo) { - _damageP2 += damage; + if (!_playerOne.isInvul()) + { + _damageP2 += damage; + } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index bd800629d9..11ce22dc88 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -1010,13 +1010,20 @@ class OlympiadGame { return; } + if (player == _playerOne) { - _damageP1 += damage; + if (!_playerTwo.isInvul()) + { + _damageP1 += damage; + } } else if (player == _playerTwo) { - _damageP2 += damage; + if (!_playerOne.isInvul()) + { + _damageP2 += damage; + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 17aa5c41d7..b7b507953f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -648,19 +648,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()) + { + _damageP1 += damage; + } } - else if (player == _playerTwo.getPlayer()) + else if (player == player2) { - _damageP2 += damage; + if (!player1.isInvul()) + { + _damageP2 += damage; + } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 1567ce6ca5..a14318ba51 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -678,19 +678,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; + } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 1567ce6ca5..a14318ba51 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -678,19 +678,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; + } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 1567ce6ca5..a14318ba51 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -678,19 +678,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; + } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 1567ce6ca5..a14318ba51 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -678,19 +678,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; + } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 1567ce6ca5..a14318ba51 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -678,19 +678,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; + } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 1567ce6ca5..a14318ba51 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -678,19 +678,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; + } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 1567ce6ca5..a14318ba51 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -678,19 +678,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; + } } } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index dd0bf29aab..1d23127fb9 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -678,19 +678,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; + } } }