Olympiad game addDamage when not invulnerable.

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}
 	

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;
+			}
 		}
 	}