diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 62d47f53aa..55193f2935 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -41,6 +41,7 @@ public class DailyMissionData implements IGameXmlReader { private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName()); private final Map> _dailyMissionRewards = new LinkedHashMap<>(); + private boolean _isAvailable; protected DailyMissionData() { @@ -52,6 +53,7 @@ public class DailyMissionData implements IGameXmlReader { _dailyMissionRewards.clear(); parseDatapackFile("data/DailyMission.xml"); + _isAvailable = !_dailyMissionRewards.isEmpty(); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards."); } @@ -124,6 +126,11 @@ public class DailyMissionData implements IGameXmlReader return _dailyMissionRewards.get(id); } + public boolean isAvailable() + { + return _isAvailable; + } + /** * Gets the single instance of DailyMissionData. * @return single instance of DailyMissionData diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 49140b392a..ff2ce606c0 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -68,7 +68,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; import com.l2jmobius.gameserver.network.serverpackets.ExBeautyItemList; import com.l2jmobius.gameserver.network.serverpackets.ExCastleState; -import com.l2jmobius.gameserver.network.serverpackets.ExConnectedTimeAndGettableReward; import com.l2jmobius.gameserver.network.serverpackets.ExGetBookMarkInfoPacket; import com.l2jmobius.gameserver.network.serverpackets.ExNoticePostArrived; import com.l2jmobius.gameserver.network.serverpackets.ExNotifyPremiumItem; @@ -100,6 +99,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SkillList; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.ability.ExAcquireAPSkillList; import com.l2jmobius.gameserver.network.serverpackets.attendance.ExVipAttendanceItemList; +import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendList; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java similarity index 81% rename from L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java rename to L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index 3cacc39dc1..bb394d05f6 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -14,10 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.gameserver.network.serverpackets; +package com.l2jmobius.gameserver.network.serverpackets.dailymission; import com.l2jmobius.commons.network.PacketWriter; +import com.l2jmobius.gameserver.data.xml.impl.DailyMissionData; import com.l2jmobius.gameserver.network.OutgoingPackets; +import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** * @author Sdw @@ -29,6 +31,11 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { + if (!DailyMissionData.getInstance().isAvailable()) + { + return true; + } + OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); for (int i = 0; i < 16; i++) // TODO : Find what the hell it is { @@ -36,5 +43,4 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket } return true; } - } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 2b3d7425c4..5aa08d1c0b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -43,6 +43,11 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { + if (!DailyMissionData.getInstance().isAvailable()) + { + return true; + } + OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 62d47f53aa..55193f2935 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -41,6 +41,7 @@ public class DailyMissionData implements IGameXmlReader { private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName()); private final Map> _dailyMissionRewards = new LinkedHashMap<>(); + private boolean _isAvailable; protected DailyMissionData() { @@ -52,6 +53,7 @@ public class DailyMissionData implements IGameXmlReader { _dailyMissionRewards.clear(); parseDatapackFile("data/DailyMission.xml"); + _isAvailable = !_dailyMissionRewards.isEmpty(); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards."); } @@ -124,6 +126,11 @@ public class DailyMissionData implements IGameXmlReader return _dailyMissionRewards.get(id); } + public boolean isAvailable() + { + return _isAvailable; + } + /** * Gets the single instance of DailyMissionData. * @return single instance of DailyMissionData diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 49140b392a..ff2ce606c0 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -68,7 +68,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; import com.l2jmobius.gameserver.network.serverpackets.ExBeautyItemList; import com.l2jmobius.gameserver.network.serverpackets.ExCastleState; -import com.l2jmobius.gameserver.network.serverpackets.ExConnectedTimeAndGettableReward; import com.l2jmobius.gameserver.network.serverpackets.ExGetBookMarkInfoPacket; import com.l2jmobius.gameserver.network.serverpackets.ExNoticePostArrived; import com.l2jmobius.gameserver.network.serverpackets.ExNotifyPremiumItem; @@ -100,6 +99,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SkillList; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.ability.ExAcquireAPSkillList; import com.l2jmobius.gameserver.network.serverpackets.attendance.ExVipAttendanceItemList; +import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendList; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java similarity index 81% rename from L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java rename to L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index 3cacc39dc1..bb394d05f6 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -14,10 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.gameserver.network.serverpackets; +package com.l2jmobius.gameserver.network.serverpackets.dailymission; import com.l2jmobius.commons.network.PacketWriter; +import com.l2jmobius.gameserver.data.xml.impl.DailyMissionData; import com.l2jmobius.gameserver.network.OutgoingPackets; +import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** * @author Sdw @@ -29,6 +31,11 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { + if (!DailyMissionData.getInstance().isAvailable()) + { + return true; + } + OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); for (int i = 0; i < 16; i++) // TODO : Find what the hell it is { @@ -36,5 +43,4 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket } return true; } - } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 40a75ee98a..b0ff91ace9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -43,6 +43,11 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { + if (!DailyMissionData.getInstance().isAvailable()) + { + return true; + } + OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); packet.writeC(0x23); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 62d47f53aa..55193f2935 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -41,6 +41,7 @@ public class DailyMissionData implements IGameXmlReader { private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName()); private final Map> _dailyMissionRewards = new LinkedHashMap<>(); + private boolean _isAvailable; protected DailyMissionData() { @@ -52,6 +53,7 @@ public class DailyMissionData implements IGameXmlReader { _dailyMissionRewards.clear(); parseDatapackFile("data/DailyMission.xml"); + _isAvailable = !_dailyMissionRewards.isEmpty(); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards."); } @@ -124,6 +126,11 @@ public class DailyMissionData implements IGameXmlReader return _dailyMissionRewards.get(id); } + public boolean isAvailable() + { + return _isAvailable; + } + /** * Gets the single instance of DailyMissionData. * @return single instance of DailyMissionData diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 76ff43b2f8..f39ce62420 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -68,7 +68,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; import com.l2jmobius.gameserver.network.serverpackets.ExBeautyItemList; import com.l2jmobius.gameserver.network.serverpackets.ExCastleState; -import com.l2jmobius.gameserver.network.serverpackets.ExConnectedTimeAndGettableReward; import com.l2jmobius.gameserver.network.serverpackets.ExGetBookMarkInfoPacket; import com.l2jmobius.gameserver.network.serverpackets.ExNoticePostArrived; import com.l2jmobius.gameserver.network.serverpackets.ExNotifyPremiumItem; @@ -100,6 +99,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SkillList; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.ability.ExAcquireAPSkillList; import com.l2jmobius.gameserver.network.serverpackets.attendance.ExVipAttendanceItemList; +import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendList; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index b0bfc7d122..ac239f828f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.DailyMissionDataHolder; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; -import com.l2jmobius.gameserver.network.serverpackets.ExConnectedTimeAndGettableReward; +import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java similarity index 88% rename from L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java rename to L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index d385716e45..53d5518773 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -14,12 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.gameserver.network.serverpackets; +package com.l2jmobius.gameserver.network.serverpackets.dailymission; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.data.xml.impl.DailyMissionData; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.OutgoingPackets; +import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** * @author Sdw @@ -36,6 +37,11 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { + if (!DailyMissionData.getInstance().isAvailable()) + { + return true; + } + OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); packet.writeD(0x00); packet.writeD(_oneDayRewardAvailableCount); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 08c823bafd..4a65398244 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -54,6 +54,11 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { + if (!DailyMissionData.getInstance().isAvailable()) + { + return true; + } + OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); packet.writeD((int) _dayRemainTime); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 62d47f53aa..55193f2935 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -41,6 +41,7 @@ public class DailyMissionData implements IGameXmlReader { private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName()); private final Map> _dailyMissionRewards = new LinkedHashMap<>(); + private boolean _isAvailable; protected DailyMissionData() { @@ -52,6 +53,7 @@ public class DailyMissionData implements IGameXmlReader { _dailyMissionRewards.clear(); parseDatapackFile("data/DailyMission.xml"); + _isAvailable = !_dailyMissionRewards.isEmpty(); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards."); } @@ -124,6 +126,11 @@ public class DailyMissionData implements IGameXmlReader return _dailyMissionRewards.get(id); } + public boolean isAvailable() + { + return _isAvailable; + } + /** * Gets the single instance of DailyMissionData. * @return single instance of DailyMissionData diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9e640d230f..604e5728cd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -68,7 +68,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; import com.l2jmobius.gameserver.network.serverpackets.ExBeautyItemList; import com.l2jmobius.gameserver.network.serverpackets.ExCastleState; -import com.l2jmobius.gameserver.network.serverpackets.ExConnectedTimeAndGettableReward; import com.l2jmobius.gameserver.network.serverpackets.ExGetBookMarkInfoPacket; import com.l2jmobius.gameserver.network.serverpackets.ExNoticePostArrived; import com.l2jmobius.gameserver.network.serverpackets.ExNotifyPremiumItem; @@ -99,6 +98,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; import com.l2jmobius.gameserver.network.serverpackets.SkillList; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.attendance.ExVipAttendanceItemList; +import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendList; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java similarity index 81% rename from L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java rename to L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index 3cacc39dc1..bb394d05f6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -14,10 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.gameserver.network.serverpackets; +package com.l2jmobius.gameserver.network.serverpackets.dailymission; import com.l2jmobius.commons.network.PacketWriter; +import com.l2jmobius.gameserver.data.xml.impl.DailyMissionData; import com.l2jmobius.gameserver.network.OutgoingPackets; +import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** * @author Sdw @@ -29,6 +31,11 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { + if (!DailyMissionData.getInstance().isAvailable()) + { + return true; + } + OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); for (int i = 0; i < 16; i++) // TODO : Find what the hell it is { @@ -36,5 +43,4 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket } return true; } - } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 40a75ee98a..b0ff91ace9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -43,6 +43,11 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { + if (!DailyMissionData.getInstance().isAvailable()) + { + return true; + } + OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); packet.writeC(0x23);