Proper naming for GameTimeController isNight getter.
This commit is contained in:
parent
f88cdc1dde
commit
0ac09f876f
@ -70,7 +70,7 @@ public class GameTimeController
|
||||
ThreadPool.scheduleAtFixedRate(new BroadcastSunState(), 0, 600000);
|
||||
}
|
||||
|
||||
public boolean isNowNight()
|
||||
public boolean isNight()
|
||||
{
|
||||
return _isNight;
|
||||
}
|
||||
|
@ -50,7 +50,7 @@ public class Time implements IUserCommandHandler
|
||||
}
|
||||
|
||||
SystemMessage sm;
|
||||
if (GameTimeController.getInstance().isNowNight())
|
||||
if (GameTimeController.getInstance().isNight())
|
||||
{
|
||||
sm = new SystemMessage(SystemMessageId.THE_CURRENT_TIME_IS_S1_S2_IN_THE_NIGHT);
|
||||
sm.addString(h);
|
||||
|
@ -180,7 +180,7 @@ public class DayNightSpawnManager
|
||||
{
|
||||
try
|
||||
{
|
||||
changeMode(GameTimeController.getInstance().isNowNight() ? 1 : 0);
|
||||
changeMode(GameTimeController.getInstance().isNight() ? 1 : 0);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@ -290,7 +290,7 @@ public class DayNightSpawnManager
|
||||
return _bosses.get(spawnDat);
|
||||
}
|
||||
|
||||
if (GameTimeController.getInstance().isNowNight())
|
||||
if (GameTimeController.getInstance().isNight())
|
||||
{
|
||||
final RaidBossInstance raidboss = (RaidBossInstance) spawnDat.doSpawn();
|
||||
_bosses.put(spawnDat, raidboss);
|
||||
|
@ -75,7 +75,7 @@ public class Fish
|
||||
|
||||
public int getType(boolean isLureNight)
|
||||
{
|
||||
if (!GameTimeController.getInstance().isNowNight() && isLureNight)
|
||||
if (!GameTimeController.getInstance().isNight() && isLureNight)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
@ -45,7 +45,7 @@ public class ConditionGameTime extends Condition
|
||||
{
|
||||
case NIGHT:
|
||||
{
|
||||
return GameTimeController.getInstance().isNowNight() == _required;
|
||||
return GameTimeController.getInstance().isNight() == _required;
|
||||
}
|
||||
}
|
||||
return !_required;
|
||||
|
@ -56,7 +56,7 @@ public class hitConditionBonus
|
||||
}
|
||||
|
||||
// Get weather bonus
|
||||
if (GameTimeController.getInstance().isNowNight())
|
||||
if (GameTimeController.getInstance().isNight())
|
||||
{
|
||||
mod += darkBonus;
|
||||
}
|
||||
|
@ -454,7 +454,7 @@ public class EnterWorld extends GameClientPacket
|
||||
final Skill skill = SkillTable.getInstance().getSkill(294, 1);
|
||||
if ((skill != null) && (player.getSkillLevel(294) == 1))
|
||||
{
|
||||
if (GameTimeController.getInstance().isNowNight())
|
||||
if (GameTimeController.getInstance().isNight())
|
||||
{
|
||||
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.IT_IS_NOW_MIDNIGHT_AND_THE_EFFECT_OF_S1_CAN_BE_FELT);
|
||||
sm.addSkillName(294);
|
||||
|
@ -70,7 +70,7 @@ public class GameTimeController
|
||||
ThreadPool.scheduleAtFixedRate(new BroadcastSunState(), 0, 600000);
|
||||
}
|
||||
|
||||
public boolean isNowNight()
|
||||
public boolean isNight()
|
||||
{
|
||||
return _isNight;
|
||||
}
|
||||
|
@ -50,7 +50,7 @@ public class Time implements IUserCommandHandler
|
||||
}
|
||||
|
||||
SystemMessage sm;
|
||||
if (GameTimeController.getInstance().isNowNight())
|
||||
if (GameTimeController.getInstance().isNight())
|
||||
{
|
||||
sm = new SystemMessage(SystemMessageId.THE_CURRENT_TIME_IS_S1_S2_IN_THE_NIGHT);
|
||||
sm.addString(h);
|
||||
|
@ -180,7 +180,7 @@ public class DayNightSpawnManager
|
||||
{
|
||||
try
|
||||
{
|
||||
changeMode(GameTimeController.getInstance().isNowNight() ? 1 : 0);
|
||||
changeMode(GameTimeController.getInstance().isNight() ? 1 : 0);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@ -290,7 +290,7 @@ public class DayNightSpawnManager
|
||||
return _bosses.get(spawnDat);
|
||||
}
|
||||
|
||||
if (GameTimeController.getInstance().isNowNight())
|
||||
if (GameTimeController.getInstance().isNight())
|
||||
{
|
||||
final RaidBossInstance raidboss = (RaidBossInstance) spawnDat.doSpawn();
|
||||
_bosses.put(spawnDat, raidboss);
|
||||
|
@ -75,7 +75,7 @@ public class Fish
|
||||
|
||||
public int getType(boolean isLureNight)
|
||||
{
|
||||
if (!GameTimeController.getInstance().isNowNight() && isLureNight)
|
||||
if (!GameTimeController.getInstance().isNight() && isLureNight)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
@ -45,7 +45,7 @@ public class ConditionGameTime extends Condition
|
||||
{
|
||||
case NIGHT:
|
||||
{
|
||||
return GameTimeController.getInstance().isNowNight() == _required;
|
||||
return GameTimeController.getInstance().isNight() == _required;
|
||||
}
|
||||
}
|
||||
return !_required;
|
||||
|
@ -56,7 +56,7 @@ public class hitConditionBonus
|
||||
}
|
||||
|
||||
// Get weather bonus
|
||||
if (GameTimeController.getInstance().isNowNight())
|
||||
if (GameTimeController.getInstance().isNight())
|
||||
{
|
||||
mod += darkBonus;
|
||||
}
|
||||
|
@ -480,7 +480,7 @@ public class EnterWorld extends GameClientPacket
|
||||
final Skill skill = SkillTable.getInstance().getSkill(294, 1);
|
||||
if ((skill != null) && (player.getSkillLevel(294) == 1))
|
||||
{
|
||||
if (GameTimeController.getInstance().isNowNight())
|
||||
if (GameTimeController.getInstance().isNight())
|
||||
{
|
||||
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.IT_IS_NOW_MIDNIGHT_AND_THE_EFFECT_OF_S1_CAN_BE_FELT);
|
||||
sm.addSkillName(294);
|
||||
|
Loading…
Reference in New Issue
Block a user