From e2a68f9aaf12f1f49cd095881428c33cf4141d97 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 6 Feb 2020 22:55:59 +0000 Subject: [PATCH] Player isInTrainingCamp method should check current time. --- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index dce05e2e92..ae4d5fb15b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13968,7 +13968,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 38350192b1..84b7621049 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14018,7 +14018,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 870d76e72b..61e76340d4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14012,7 +14012,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 720e6f9e47..12497ef5ae 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13973,7 +13973,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 66ca1c1f80..b44a181467 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13976,7 +13976,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7457666b00..c6e976f48f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13982,7 +13982,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 0146deb339..bacd658ca1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13938,7 +13938,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f6477fc3fd..e17f634829 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13799,7 +13799,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index bbceeebbe7..c6474fa19a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13806,7 +13806,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index b4ffe8e17b..d9ed03bcd8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13790,7 +13790,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 13e8b819c0..72b14983a2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13832,7 +13832,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 65f393c6a9..6a89cfd182 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13832,7 +13832,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d0fb5372fe..d8bbb6fddb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13722,7 +13722,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 401ac5afe2..a4bc7e96d9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13827,7 +13827,7 @@ public class PlayerInstance extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > 0); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo()