Proper player two olympiad addDamage getter.
This commit is contained in:
@ -681,7 +681,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -687,7 +687,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -687,7 +687,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -687,7 +687,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -687,7 +687,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -687,7 +687,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -687,7 +687,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -687,7 +687,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -681,7 +681,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -651,7 +651,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -681,7 +681,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -681,7 +681,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -681,7 +681,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -681,7 +681,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -681,7 +681,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -681,7 +681,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -681,7 +681,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -681,7 +681,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
protected void addDamage(PlayerInstance player, int damage)
|
protected void addDamage(PlayerInstance player, int damage)
|
||||||
{
|
{
|
||||||
final PlayerInstance player1 = _playerOne.getPlayer();
|
final PlayerInstance player1 = _playerOne.getPlayer();
|
||||||
final PlayerInstance player2 = _playerOne.getPlayer();
|
final PlayerInstance player2 = _playerTwo.getPlayer();
|
||||||
if ((player1 == null) || (player2 == null))
|
if ((player1 == null) || (player2 == null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
Reference in New Issue
Block a user