diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 5ca18a88c3..b9a5566548 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -53,6 +55,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -68,5 +76,7 @@ public class RequestOneDayRewardReceive implements ClientPacket } player.sendPacket(new ExOneDayReceiveRewardList(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 5ca18a88c3..b9a5566548 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -53,6 +55,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -68,5 +76,7 @@ public class RequestOneDayRewardReceive implements ClientPacket } player.sendPacket(new ExOneDayReceiveRewardList(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 1e0d49ba87..b90b656179 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -54,6 +56,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -70,5 +78,7 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 58155f519e..5ef7bf8a94 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgeV2; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -54,6 +56,12 @@ public class RequestExPledgeMissionReward implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection reward = DailyMissionData.getInstance().getDailyMissionData(_id); if ((reward != null) && !reward.isEmpty()) { @@ -61,5 +69,7 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionRewardCount(player)); client.sendPacket(new ExPledgeMissionInfo(player)); } + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 58155f519e..5ef7bf8a94 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgeV2; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -54,6 +56,12 @@ public class RequestExPledgeMissionReward implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection reward = DailyMissionData.getInstance().getDailyMissionData(_id); if ((reward != null) && !reward.isEmpty()) { @@ -61,5 +69,7 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionRewardCount(player)); client.sendPacket(new ExPledgeMissionInfo(player)); } + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 58155f519e..5ef7bf8a94 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgeV2; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -54,6 +56,12 @@ public class RequestExPledgeMissionReward implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection reward = DailyMissionData.getInstance().getDailyMissionData(_id); if ((reward != null) && !reward.isEmpty()) { @@ -61,5 +69,7 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionRewardCount(player)); client.sendPacket(new ExPledgeMissionInfo(player)); } + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 58155f519e..5ef7bf8a94 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgeV2; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -54,6 +56,12 @@ public class RequestExPledgeMissionReward implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection reward = DailyMissionData.getInstance().getDailyMissionData(_id); if ((reward != null) && !reward.isEmpty()) { @@ -61,5 +69,7 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionRewardCount(player)); client.sendPacket(new ExPledgeMissionInfo(player)); } + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 58155f519e..5ef7bf8a94 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgeV2; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -54,6 +56,12 @@ public class RequestExPledgeMissionReward implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection reward = DailyMissionData.getInstance().getDailyMissionData(_id); if ((reward != null) && !reward.isEmpty()) { @@ -61,5 +69,7 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionRewardCount(player)); client.sendPacket(new ExPledgeMissionInfo(player)); } + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 58155f519e..5ef7bf8a94 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgeV2; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -54,6 +56,12 @@ public class RequestExPledgeMissionReward implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection reward = DailyMissionData.getInstance().getDailyMissionData(_id); if ((reward != null) && !reward.isEmpty()) { @@ -61,5 +69,7 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionRewardCount(player)); client.sendPacket(new ExPledgeMissionInfo(player)); } + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 58155f519e..5ef7bf8a94 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgeV2; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -54,6 +56,12 @@ public class RequestExPledgeMissionReward implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection reward = DailyMissionData.getInstance().getDailyMissionData(_id); if ((reward != null) && !reward.isEmpty()) { @@ -61,5 +69,7 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionRewardCount(player)); client.sendPacket(new ExPledgeMissionInfo(player)); } + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 58155f519e..5ef7bf8a94 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgeV2; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -54,6 +56,12 @@ public class RequestExPledgeMissionReward implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection reward = DailyMissionData.getInstance().getDailyMissionData(_id); if ((reward != null) && !reward.isEmpty()) { @@ -61,5 +69,7 @@ public class RequestExPledgeMissionReward implements ClientPacket client.sendPacket(new ExPledgeMissionRewardCount(player)); client.sendPacket(new ExPledgeMissionInfo(player)); } + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 5ca18a88c3..b9a5566548 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -53,6 +55,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -68,5 +76,7 @@ public class RequestOneDayRewardReceive implements ClientPacket } player.sendPacket(new ExOneDayReceiveRewardList(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 1e0d49ba87..b90b656179 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -54,6 +56,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -70,5 +78,7 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 1e0d49ba87..b90b656179 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -54,6 +56,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -70,5 +78,7 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 1e0d49ba87..b90b656179 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -54,6 +56,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -70,5 +78,7 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 1e0d49ba87..b90b656179 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -54,6 +56,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -70,5 +78,7 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 1e0d49ba87..b90b656179 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -54,6 +56,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -70,5 +78,7 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 1e0d49ba87..b90b656179 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -54,6 +56,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -70,5 +78,7 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 1e0d49ba87..b90b656179 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -54,6 +56,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -70,5 +78,7 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 1e0d49ba87..b90b656179 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -54,6 +56,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -70,5 +78,7 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 1e0d49ba87..b90b656179 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -54,6 +56,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -70,5 +78,7 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 1e0d49ba87..b90b656179 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -54,6 +56,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -70,5 +78,7 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java new file mode 100644 index 0000000000..1d6718d19b --- /dev/null +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/request/RewardRequest.java @@ -0,0 +1,36 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.actor.request; + +import org.l2jmobius.gameserver.model.actor.Player; + +/** + * @author Mobius + */ +public class RewardRequest extends AbstractRequest +{ + public RewardRequest(Player player) + { + super(player); + } + + @Override + public boolean isUsing(int objectId) + { + return false; + } +} diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 1e0d49ba87..b90b656179 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -19,9 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets.dailymission; import java.util.Collection; import org.l2jmobius.commons.network.ReadablePacket; +import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -54,6 +56,12 @@ public class RequestOneDayRewardReceive implements ClientPacket return; } + if (player.hasRequest(RewardRequest.class)) + { + return; + } + player.addRequest(new RewardRequest(player)); + final Collection rewards = DailyMissionData.getInstance().getDailyMissionData(_id); if ((rewards == null) || rewards.isEmpty()) { @@ -70,5 +78,7 @@ public class RequestOneDayRewardReceive implements ClientPacket player.sendPacket(new ExOneDayReceiveRewardList(player, true)); player.sendPacket(new ExConnectedTimeAndGettableReward(player)); + + ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50); } }