Эх сурвалжийг харах

BETA: DP-Part for [L5871]

Rumen Nikiforov 12 жил өмнө
parent
commit
dd8b22d08f

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Time.java

@@ -61,7 +61,7 @@ public class Time implements IUserCommandHandler
 		}
 		
 		SystemMessage sm;
-		if (GameTimeController.getInstance().isNowNight())
+		if (GameTimeController.getInstance().isNight())
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.TIME_S1_S2_IN_THE_NIGHT);
 			sm.addString(h);

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java

@@ -59,7 +59,7 @@ public class Unstuck implements IUserCommandHandler
 		{
 			return false;
 		}
-		activeChar.forceIsCasting(GameTimeController.getGameTicks() + (unstuckTimer / GameTimeController.MILLIS_IN_TICK));
+		activeChar.forceIsCasting(GameTimeController.getInstance().getGameTicks() + (unstuckTimer / GameTimeController.MILLIS_IN_TICK));
 		
 		L2Skill escape = SkillTable.getInstance().getInfo(2099, 1); // 5 minutes escape
 		L2Skill GM_escape = SkillTable.getInstance().getInfo(2100, 1); // 1 second escape

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java

@@ -475,7 +475,7 @@ public class Wedding implements IVoicedCommandHandler
 		final EscapeFinalizer ef = new EscapeFinalizer(activeChar, partner.getX(), partner.getY(), partner.getZ(), partner.isIn7sDungeon());
 		// continue execution later
 		activeChar.setSkillCast(ThreadPoolManager.getInstance().scheduleGeneral(ef, teleportTimer));
-		activeChar.forceIsCasting(GameTimeController.getGameTicks() + (teleportTimer / GameTimeController.MILLIS_IN_TICK));
+		activeChar.forceIsCasting(GameTimeController.getInstance().getGameTicks() + (teleportTimer / GameTimeController.MILLIS_IN_TICK));
 		
 		return true;
 	}

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Shadai/Shadai.java

@@ -58,12 +58,12 @@ public class Shadai extends Quest
 	{
 		int[] coords = DAY_COORDS;
 		boolean mustRevalidate = false;
-		if ((npc.getX() != NIGHT_COORDS[0]) && GameTimeController.getInstance().isNowNight())
+		if ((npc.getX() != NIGHT_COORDS[0]) && GameTimeController.getInstance().isNight())
 		{
 			coords = NIGHT_COORDS;
 			mustRevalidate = true;
 		}
-		else if ((npc.getX() != DAY_COORDS[0]) && !GameTimeController.getInstance().isNowNight())
+		else if ((npc.getX() != DAY_COORDS[0]) && !GameTimeController.getInstance().isNight())
 		{
 			mustRevalidate = true;
 		}