From 0ac09f876f0ca1d3da8a0e1bbfcace260e96247b Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 11 Jul 2020 06:48:46 +0000
Subject: [PATCH] Proper naming for GameTimeController isNight getter.

---
 .../java/org/l2jmobius/gameserver/GameTimeController.java     | 2 +-
 .../gameserver/handler/usercommandhandlers/Time.java          | 2 +-
 .../gameserver/instancemanager/DayNightSpawnManager.java      | 4 ++--
 .../java/org/l2jmobius/gameserver/model/Fish.java             | 2 +-
 .../gameserver/model/skills/conditions/ConditionGameTime.java | 2 +-
 .../l2jmobius/gameserver/model/skills/hitConditionBonus.java  | 2 +-
 .../gameserver/network/clientpackets/EnterWorld.java          | 2 +-
 .../java/org/l2jmobius/gameserver/GameTimeController.java     | 2 +-
 .../gameserver/handler/usercommandhandlers/Time.java          | 2 +-
 .../gameserver/instancemanager/DayNightSpawnManager.java      | 4 ++--
 .../java/org/l2jmobius/gameserver/model/Fish.java             | 2 +-
 .../gameserver/model/skills/conditions/ConditionGameTime.java | 2 +-
 .../l2jmobius/gameserver/model/skills/hitConditionBonus.java  | 2 +-
 .../gameserver/network/clientpackets/EnterWorld.java          | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameTimeController.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameTimeController.java
index 37cbce0380..be87537406 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameTimeController.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameTimeController.java
@@ -70,7 +70,7 @@ public class GameTimeController
 		ThreadPool.scheduleAtFixedRate(new BroadcastSunState(), 0, 600000);
 	}
 	
-	public boolean isNowNight()
+	public boolean isNight()
 	{
 		return _isNight;
 	}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Time.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Time.java
index 69b7e4d4be..3d57ce7af3 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Time.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Time.java
@@ -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);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java
index b5d19f5cd8..78cf80f8ea 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java
@@ -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);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Fish.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Fish.java
index 73f21de22d..a8fa85161f 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Fish.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Fish.java
@@ -75,7 +75,7 @@ public class Fish
 	
 	public int getType(boolean isLureNight)
 	{
-		if (!GameTimeController.getInstance().isNowNight() && isLureNight)
+		if (!GameTimeController.getInstance().isNight() && isLureNight)
 		{
 			return -1;
 		}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameTime.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameTime.java
index 23cb79e7fd..1bcc1a346e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameTime.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameTime.java
@@ -45,7 +45,7 @@ public class ConditionGameTime extends Condition
 		{
 			case NIGHT:
 			{
-				return GameTimeController.getInstance().isNowNight() == _required;
+				return GameTimeController.getInstance().isNight() == _required;
 			}
 		}
 		return !_required;
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/hitConditionBonus.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/hitConditionBonus.java
index 4cec3ca1d8..3abab99b5e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/hitConditionBonus.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/hitConditionBonus.java
@@ -56,7 +56,7 @@ public class hitConditionBonus
 		}
 		
 		// Get weather bonus
-		if (GameTimeController.getInstance().isNowNight())
+		if (GameTimeController.getInstance().isNight())
 		{
 			mod += darkBonus;
 		}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 797d4712b3..d63996e5fa 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -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);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameTimeController.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameTimeController.java
index 37cbce0380..be87537406 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameTimeController.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameTimeController.java
@@ -70,7 +70,7 @@ public class GameTimeController
 		ThreadPool.scheduleAtFixedRate(new BroadcastSunState(), 0, 600000);
 	}
 	
-	public boolean isNowNight()
+	public boolean isNight()
 	{
 		return _isNight;
 	}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Time.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Time.java
index 69b7e4d4be..3d57ce7af3 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Time.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Time.java
@@ -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);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java
index b5d19f5cd8..78cf80f8ea 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java
@@ -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);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fish.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fish.java
index 73f21de22d..a8fa85161f 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fish.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fish.java
@@ -75,7 +75,7 @@ public class Fish
 	
 	public int getType(boolean isLureNight)
 	{
-		if (!GameTimeController.getInstance().isNowNight() && isLureNight)
+		if (!GameTimeController.getInstance().isNight() && isLureNight)
 		{
 			return -1;
 		}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameTime.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameTime.java
index 23cb79e7fd..1bcc1a346e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameTime.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionGameTime.java
@@ -45,7 +45,7 @@ public class ConditionGameTime extends Condition
 		{
 			case NIGHT:
 			{
-				return GameTimeController.getInstance().isNowNight() == _required;
+				return GameTimeController.getInstance().isNight() == _required;
 			}
 		}
 		return !_required;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/hitConditionBonus.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/hitConditionBonus.java
index 4cec3ca1d8..3abab99b5e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/hitConditionBonus.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/hitConditionBonus.java
@@ -56,7 +56,7 @@ public class hitConditionBonus
 		}
 		
 		// Get weather bonus
-		if (GameTimeController.getInstance().isNowNight())
+		if (GameTimeController.getInstance().isNight())
 		{
 			mod += darkBonus;
 		}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index c544243089..ee2f3d397f 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -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);