Proper case for olympiad start variable.

This commit is contained in:
MobiusDevelopment
2021-04-08 20:15:43 +00:00
parent 8962ec67be
commit 2b631bb377
21 changed files with 107 additions and 107 deletions
@@ -496,7 +496,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4084,7 +4084,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8164,7 +8164,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9251,12 +9251,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -498,7 +498,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4090,7 +4090,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8171,7 +8171,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9258,12 +9258,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -500,7 +500,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4092,7 +4092,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8173,7 +8173,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9260,12 +9260,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -504,7 +504,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4088,7 +4088,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8168,7 +8168,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9255,12 +9255,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -502,7 +502,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4067,7 +4067,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8147,7 +8147,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9242,12 +9242,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -502,7 +502,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4067,7 +4067,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8147,7 +8147,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9242,12 +9242,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -502,7 +502,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4068,7 +4068,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8148,7 +8148,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9243,12 +9243,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -514,7 +514,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4001,7 +4001,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8159,7 +8159,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9254,12 +9254,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -508,7 +508,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4005,7 +4005,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8187,7 +8187,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9282,12 +9282,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -508,7 +508,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4005,7 +4005,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8187,7 +8187,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9282,12 +9282,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -476,7 +476,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
/** Olympiad buff count. */ /** Olympiad buff count. */
@@ -4134,7 +4134,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, new PartySmallWindowUpdate(this)); party.broadcastToPartyMembers(this, new PartySmallWindowUpdate(this));
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
Collection<PlayerInstance> players = World.getInstance().getVisibleObjects(this, PlayerInstance.class); Collection<PlayerInstance> players = World.getInstance().getVisibleObjects(this, PlayerInstance.class);
if ((players != null) && !players.isEmpty()) if ((players != null) && !players.isEmpty())
@@ -8399,7 +8399,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
return _inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()); return _inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId());
} }
// Check if the attacker is in TvT and TvT is started // Check if the attacker is in TvT and TvT is started
@@ -8808,7 +8808,7 @@ public class PlayerInstance extends Playable
return false; return false;
} }
if (_inOlympiadMode && !_OlympiadStart) if (_inOlympiadMode && !_olympiadStart)
{ {
// if PlayerInstance is in Olympia and the match isn't already start, send a Server->Client packet ActionFailed // if PlayerInstance is in Olympia and the match isn't already start, send a Server->Client packet ActionFailed
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
@@ -9755,12 +9755,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -495,7 +495,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
/** Olympiad buff count. */ /** Olympiad buff count. */
@@ -4045,7 +4045,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, new PartySmallWindowUpdate(this)); party.broadcastToPartyMembers(this, new PartySmallWindowUpdate(this));
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8283,7 +8283,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
return _inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()); return _inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId());
} }
// Check if the attacker is in TvT and TvT is started // Check if the attacker is in TvT and TvT is started
@@ -8692,7 +8692,7 @@ public class PlayerInstance extends Playable
return false; return false;
} }
if (_inOlympiadMode && !_OlympiadStart) if (_inOlympiadMode && !_olympiadStart)
{ {
// if PlayerInstance is in Olympia and the match isn't already start, send a Server->Client packet ActionFailed // if PlayerInstance is in Olympia and the match isn't already start, send a Server->Client packet ActionFailed
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
@@ -9638,12 +9638,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -494,7 +494,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4042,7 +4042,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8058,7 +8058,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9138,12 +9138,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -494,7 +494,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4042,7 +4042,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8058,7 +8058,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9138,12 +9138,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -492,7 +492,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4026,7 +4026,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8044,7 +8044,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9124,12 +9124,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -499,7 +499,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4037,7 +4037,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8071,7 +8071,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9151,12 +9151,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -499,7 +499,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4037,7 +4037,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8071,7 +8071,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9151,12 +9151,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -512,7 +512,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -3959,7 +3959,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8018,7 +8018,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9098,12 +9098,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -494,7 +494,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4044,7 +4044,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8060,7 +8060,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9150,12 +9150,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -518,7 +518,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4027,7 +4027,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8097,7 +8097,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9185,12 +9185,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()
@@ -518,7 +518,7 @@ public class PlayerInstance extends Playable
/** Olympiad */ /** Olympiad */
private boolean _inOlympiadMode = false; private boolean _inOlympiadMode = false;
private boolean _OlympiadStart = false; private boolean _olympiadStart = false;
private int _olympiadGameId = -1; private int _olympiadGameId = -1;
private int _olympiadSide = -1; private int _olympiadSide = -1;
@@ -4027,7 +4027,7 @@ public class PlayerInstance extends Playable
party.broadcastToPartyMembers(this, partyWindow); party.broadcastToPartyMembers(this, partyWindow);
} }
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) if (_inOlympiadMode && _olympiadStart && (needCpUpdate || needHpUpdate))
{ {
final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
if ((game != null) && game.isBattleStarted()) if ((game != null) && game.isBattleStarted())
@@ -8101,7 +8101,7 @@ public class PlayerInstance extends Playable
// Check if the attacker is in olympia and olympia start // Check if the attacker is in olympia and olympia start
if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode())
{ {
if (_inOlympiadMode && _OlympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) if (_inOlympiadMode && _olympiadStart && (((PlayerInstance) attacker).getOlympiadGameId() == getOlympiadGameId()))
{ {
return true; return true;
} }
@@ -9189,12 +9189,12 @@ public class PlayerInstance extends Playable
public void setOlympiadStart(boolean value) public void setOlympiadStart(boolean value)
{ {
_OlympiadStart = value; _olympiadStart = value;
} }
public boolean isOlympiadStart() public boolean isOlympiadStart()
{ {
return _OlympiadStart; return _olympiadStart;
} }
public boolean isHero() public boolean isHero()