From dde93f3788a5e5b23a6d85b178b9957f45e7a78f Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 17 Nov 2017 16:39:39 +0000 Subject: [PATCH] Training camp improvements. --- .../ai/others/Recruiter/Recruiter.java | 19 +++++-------------- .../training/NotifyTrainingRoomEnd.java | 1 + .../training/ExTrainingZone_Admission.java | 9 --------- .../ai/others/Recruiter/Recruiter.java | 19 +++++-------------- .../training/NotifyTrainingRoomEnd.java | 1 + .../training/ExTrainingZone_Admission.java | 9 --------- .../ai/others/Recruiter/Recruiter.java | 19 +++++-------------- .../training/NotifyTrainingRoomEnd.java | 1 + .../training/ExTrainingZone_Admission.java | 9 --------- .../ai/others/Recruiter/Recruiter.java | 19 +++++-------------- .../training/NotifyTrainingRoomEnd.java | 1 + .../training/ExTrainingZone_Admission.java | 9 --------- .../training/NotifyTrainingRoomEnd.java | 1 + .../training/ExTrainingZone_Admission.java | 9 --------- 14 files changed, 25 insertions(+), 101 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java index 9d6bde58cc..b723c2567c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java @@ -114,15 +114,7 @@ public final class Recruiter extends AbstractNpcAI // @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it. player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1)); final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration; - if (trainingCampDuration > 0) - { - player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining)); - } - else - { - player.sendPacket(new ExTrainingZone_Admission(player)); - } - + player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining)); startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player); } else @@ -147,10 +139,8 @@ public final class Recruiter extends AbstractNpcAI final long trainingTime = Math.max(0, holder.getTrainingTime(TimeUnit.MINUTES)); if (trainingTime > 0) { - long expGained = 0; - long spGained = 0; - expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()); - spGained = expGained / 250L; + final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60; + final long spGained = expGained / 250L; String html = getHtm(player.getHtmlPrefix(), "4378-04.htm"); html = html.replace("%training_level%", String.valueOf(holder.getLevel())); html = html.replace("%training_time%", String.valueOf(trainingTime)); @@ -186,7 +176,7 @@ public final class Recruiter extends AbstractNpcAI { player.sendPacket(SystemMessageId.CALCULATING_XP_AND_SP_OBTAINED_FROM_TRAINING); - final long expGained = (long) (trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider(); + final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60; final long spGained = expGained / 250; player.addExpAndSp(expGained, spGained); @@ -215,6 +205,7 @@ public final class Recruiter extends AbstractNpcAI if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { holder.setEndTime(System.currentTimeMillis()); + player.setTraingCampInfo(holder); player.enableAllSkills(); player.setIsInvul(false); player.setInvisible(false); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index 67c81cd1ab..63c0dde6f3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -53,6 +53,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { holder.setEndTime(System.currentTimeMillis()); + activeChar.setTraingCampInfo(holder); activeChar.enableAllSkills(); activeChar.setIsInvul(false); activeChar.setInvisible(false); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java index 4048c8cf92..41460b4584 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.network.serverpackets.training; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.OutgoingPackets; import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -33,14 +32,6 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket private final double _maxExp; private final double _maxSp; - public ExTrainingZone_Admission(L2PcInstance player) - { - _timeElapsed = 0; - _timeRemaining = Config.TRAINING_CAMP_MAX_DURATION; - _maxExp = (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel())) / Config.TRAINING_CAMP_MAX_DURATION; - _maxSp = _maxExp / 250d; - } - public ExTrainingZone_Admission(int level, long timeElapsed, long timeRemaing) { _timeElapsed = timeElapsed; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java index 9d6bde58cc..b723c2567c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java @@ -114,15 +114,7 @@ public final class Recruiter extends AbstractNpcAI // @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it. player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1)); final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration; - if (trainingCampDuration > 0) - { - player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining)); - } - else - { - player.sendPacket(new ExTrainingZone_Admission(player)); - } - + player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining)); startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player); } else @@ -147,10 +139,8 @@ public final class Recruiter extends AbstractNpcAI final long trainingTime = Math.max(0, holder.getTrainingTime(TimeUnit.MINUTES)); if (trainingTime > 0) { - long expGained = 0; - long spGained = 0; - expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()); - spGained = expGained / 250L; + final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60; + final long spGained = expGained / 250L; String html = getHtm(player.getHtmlPrefix(), "4378-04.htm"); html = html.replace("%training_level%", String.valueOf(holder.getLevel())); html = html.replace("%training_time%", String.valueOf(trainingTime)); @@ -186,7 +176,7 @@ public final class Recruiter extends AbstractNpcAI { player.sendPacket(SystemMessageId.CALCULATING_XP_AND_SP_OBTAINED_FROM_TRAINING); - final long expGained = (long) (trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider(); + final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60; final long spGained = expGained / 250; player.addExpAndSp(expGained, spGained); @@ -215,6 +205,7 @@ public final class Recruiter extends AbstractNpcAI if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { holder.setEndTime(System.currentTimeMillis()); + player.setTraingCampInfo(holder); player.enableAllSkills(); player.setIsInvul(false); player.setInvisible(false); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index 67c81cd1ab..63c0dde6f3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -53,6 +53,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { holder.setEndTime(System.currentTimeMillis()); + activeChar.setTraingCampInfo(holder); activeChar.enableAllSkills(); activeChar.setIsInvul(false); activeChar.setInvisible(false); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java index 4048c8cf92..41460b4584 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.network.serverpackets.training; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.OutgoingPackets; import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -33,14 +32,6 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket private final double _maxExp; private final double _maxSp; - public ExTrainingZone_Admission(L2PcInstance player) - { - _timeElapsed = 0; - _timeRemaining = Config.TRAINING_CAMP_MAX_DURATION; - _maxExp = (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel())) / Config.TRAINING_CAMP_MAX_DURATION; - _maxSp = _maxExp / 250d; - } - public ExTrainingZone_Admission(int level, long timeElapsed, long timeRemaing) { _timeElapsed = timeElapsed; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java index 9d6bde58cc..b723c2567c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java @@ -114,15 +114,7 @@ public final class Recruiter extends AbstractNpcAI // @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it. player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1)); final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration; - if (trainingCampDuration > 0) - { - player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining)); - } - else - { - player.sendPacket(new ExTrainingZone_Admission(player)); - } - + player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining)); startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player); } else @@ -147,10 +139,8 @@ public final class Recruiter extends AbstractNpcAI final long trainingTime = Math.max(0, holder.getTrainingTime(TimeUnit.MINUTES)); if (trainingTime > 0) { - long expGained = 0; - long spGained = 0; - expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()); - spGained = expGained / 250L; + final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60; + final long spGained = expGained / 250L; String html = getHtm(player.getHtmlPrefix(), "4378-04.htm"); html = html.replace("%training_level%", String.valueOf(holder.getLevel())); html = html.replace("%training_time%", String.valueOf(trainingTime)); @@ -186,7 +176,7 @@ public final class Recruiter extends AbstractNpcAI { player.sendPacket(SystemMessageId.CALCULATING_XP_AND_SP_OBTAINED_FROM_TRAINING); - final long expGained = (long) (trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider(); + final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60; final long spGained = expGained / 250; player.addExpAndSp(expGained, spGained); @@ -215,6 +205,7 @@ public final class Recruiter extends AbstractNpcAI if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { holder.setEndTime(System.currentTimeMillis()); + player.setTraingCampInfo(holder); player.enableAllSkills(); player.setIsInvul(false); player.setInvisible(false); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index 67c81cd1ab..63c0dde6f3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -53,6 +53,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { holder.setEndTime(System.currentTimeMillis()); + activeChar.setTraingCampInfo(holder); activeChar.enableAllSkills(); activeChar.setIsInvul(false); activeChar.setInvisible(false); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java index 4048c8cf92..41460b4584 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.network.serverpackets.training; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.OutgoingPackets; import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -33,14 +32,6 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket private final double _maxExp; private final double _maxSp; - public ExTrainingZone_Admission(L2PcInstance player) - { - _timeElapsed = 0; - _timeRemaining = Config.TRAINING_CAMP_MAX_DURATION; - _maxExp = (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel())) / Config.TRAINING_CAMP_MAX_DURATION; - _maxSp = _maxExp / 250d; - } - public ExTrainingZone_Admission(int level, long timeElapsed, long timeRemaing) { _timeElapsed = timeElapsed; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java index 6415b22688..008e5283ee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java @@ -114,15 +114,7 @@ public final class Recruiter extends AbstractNpcAI // @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it. player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1)); final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration; - if (trainingCampDuration > 0) - { - player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining)); - } - else - { - player.sendPacket(new ExTrainingZone_Admission(player)); - } - + player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining)); startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player); } else @@ -147,10 +139,8 @@ public final class Recruiter extends AbstractNpcAI final long trainingTime = Math.max(0, holder.getTrainingTime(TimeUnit.MINUTES)); if (trainingTime > 0) { - long expGained = 0; - long spGained = 0; - expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()); - spGained = expGained / 250L; + final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60; + final long spGained = expGained / 250L; String html = getHtm(player.getHtmlPrefix(), "4378-04.htm"); html = html.replace("%training_level%", String.valueOf(holder.getLevel())); html = html.replace("%training_time%", String.valueOf(trainingTime)); @@ -186,7 +176,7 @@ public final class Recruiter extends AbstractNpcAI { player.sendPacket(SystemMessageId.CALCULATING_XP_AND_SP_OBTAINED_FROM_TRAINING); - final long expGained = (long) (trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider(); + final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60; final long spGained = expGained / 250; player.addExpAndSp(expGained, spGained); @@ -215,6 +205,7 @@ public final class Recruiter extends AbstractNpcAI if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { holder.setEndTime(System.currentTimeMillis()); + player.setTraingCampInfo(holder); player.enableAllSkills(); player.setIsInvul(false); player.setInvisible(false); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index 1bf0940c22..61c8df2501 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -53,6 +53,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { holder.setEndTime(System.currentTimeMillis()); + activeChar.setTraingCampInfo(holder); activeChar.enableAllSkills(); activeChar.setIsInvul(false); activeChar.setInvisible(false); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java index 4c8a4aaacb..4f019cb7ad 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.network.serverpackets.training; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.OutgoingPackets; import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -33,14 +32,6 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket private final double _maxExp; private final double _maxSp; - public ExTrainingZone_Admission(L2PcInstance player) - { - _timeElapsed = 0; - _timeRemaining = Config.TRAINING_CAMP_MAX_DURATION; - _maxExp = (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel())) / Config.TRAINING_CAMP_MAX_DURATION; - _maxSp = _maxExp / 250d; - } - public ExTrainingZone_Admission(int level, long timeElapsed, long timeRemaing) { _timeElapsed = timeElapsed; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index 67c81cd1ab..63c0dde6f3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -53,6 +53,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { holder.setEndTime(System.currentTimeMillis()); + activeChar.setTraingCampInfo(holder); activeChar.enableAllSkills(); activeChar.setIsInvul(false); activeChar.setInvisible(false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java index 4048c8cf92..41460b4584 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.network.serverpackets.training; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.OutgoingPackets; import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -33,14 +32,6 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket private final double _maxExp; private final double _maxSp; - public ExTrainingZone_Admission(L2PcInstance player) - { - _timeElapsed = 0; - _timeRemaining = Config.TRAINING_CAMP_MAX_DURATION; - _maxExp = (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel())) / Config.TRAINING_CAMP_MAX_DURATION; - _maxSp = _maxExp / 250d; - } - public ExTrainingZone_Admission(int level, long timeElapsed, long timeRemaing) { _timeElapsed = timeElapsed;