Proper player two olympiad addDamage getter.

This commit is contained in:
MobiusDevelopment
2020-11-18 22:55:34 +00:00
parent b6eaf10d8b
commit 5c669e248d
18 changed files with 18 additions and 18 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;