RewardRequest delay adjustments and some additions.

This commit is contained in:
MobiusDevelopment 2023-01-12 03:56:42 +00:00
parent 903d3f59df
commit 9cb5f9bf38
28 changed files with 71 additions and 26 deletions

View File

@ -64,6 +64,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -77,6 +78,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -64,6 +64,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -77,6 +78,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player, true));
player.sendPacket(new ExConnectedTimeAndGettableReward(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket
client.sendPacket(new ExPledgeMissionInfo(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket
client.sendPacket(new ExPledgeMissionInfo(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket
client.sendPacket(new ExPledgeMissionInfo(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket
client.sendPacket(new ExPledgeMissionInfo(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket
client.sendPacket(new ExPledgeMissionInfo(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket
client.sendPacket(new ExPledgeMissionInfo(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket
client.sendPacket(new ExPledgeMissionInfo(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -129,7 +129,7 @@ public class RequestHuntPassReward implements ClientPacket
player.sendPacket(new HuntPassSayhasSupportInfo(player));
player.sendPacket(new HuntPassSimpleInfo(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
private void rewardItem(Player player, ItemHolder reward)

View File

@ -76,6 +76,6 @@ public class RequestExPledgeMissionReward implements ClientPacket
client.sendPacket(new ExPledgeMissionInfo(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -64,6 +64,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -77,6 +78,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player, true));
player.sendPacket(new ExConnectedTimeAndGettableReward(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player, true));
player.sendPacket(new ExConnectedTimeAndGettableReward(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player, true));
player.sendPacket(new ExConnectedTimeAndGettableReward(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player, true));
player.sendPacket(new ExConnectedTimeAndGettableReward(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player, true));
player.sendPacket(new ExConnectedTimeAndGettableReward(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player, true));
player.sendPacket(new ExConnectedTimeAndGettableReward(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player, true));
player.sendPacket(new ExConnectedTimeAndGettableReward(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player, true));
player.sendPacket(new ExConnectedTimeAndGettableReward(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player, true));
player.sendPacket(new ExConnectedTimeAndGettableReward(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -17,9 +17,11 @@
package org.l2jmobius.gameserver.network.clientpackets.dailymission;
import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.xml.MissionLevel;
import org.l2jmobius.gameserver.model.MissionLevelHolder;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.RewardRequest;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.holders.MissionLevelPlayerDataHolder;
import org.l2jmobius.gameserver.network.GameClient;
@ -51,6 +53,12 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
return;
}
if (player.hasRequest(RewardRequest.class))
{
return;
}
player.addRequest(new RewardRequest(player));
final MissionLevelPlayerDataHolder info = player.getMissionLevelProgress();
switch (_rewardType)
{
@ -58,6 +66,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
{
if (!_holder.getNormalRewards().containsKey(_level) || info.getCollectedNormalRewards().contains(_level) || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level)))
{
player.removeRequest(RewardRequest.class);
return;
}
@ -71,6 +80,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
{
if (!_holder.getKeyRewards().containsKey(_level) || info.getCollectedKeyRewards().contains(_level) || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level)))
{
player.removeRequest(RewardRequest.class);
return;
}
@ -84,6 +94,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
{
if ((_holder.getSpecialReward() == null) || info.getCollectedSpecialReward() || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level)))
{
player.removeRequest(RewardRequest.class);
return;
}
@ -97,6 +108,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
{
if (!_holder.getBonusRewardIsAvailable() || (_holder.getBonusReward() == null) || !info.getCollectedSpecialReward() || info.getCollectedBonusReward() || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level)))
{
player.removeRequest(RewardRequest.class);
return;
}
@ -118,6 +130,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
}
else
{
player.removeRequest(RewardRequest.class);
return;
}
}
@ -134,5 +147,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
}
player.sendPacket(new ExMissionLevelRewardList(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player, true));
player.sendPacket(new ExConnectedTimeAndGettableReward(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -129,7 +129,7 @@ public class RequestHuntPassReward implements ClientPacket
player.sendPacket(new HuntPassSayhasSupportInfo(player));
player.sendPacket(new HuntPassSimpleInfo(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
private void rewardItem(Player player, ItemHolder reward)

View File

@ -17,9 +17,11 @@
package org.l2jmobius.gameserver.network.clientpackets.dailymission;
import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.xml.MissionLevel;
import org.l2jmobius.gameserver.model.MissionLevelHolder;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.request.RewardRequest;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.holders.MissionLevelPlayerDataHolder;
import org.l2jmobius.gameserver.network.GameClient;
@ -51,6 +53,12 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
return;
}
if (player.hasRequest(RewardRequest.class))
{
return;
}
player.addRequest(new RewardRequest(player));
final MissionLevelPlayerDataHolder info = player.getMissionLevelProgress();
switch (_rewardType)
{
@ -58,6 +66,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
{
if (!_holder.getNormalRewards().containsKey(_level) || info.getCollectedNormalRewards().contains(_level) || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level)))
{
player.removeRequest(RewardRequest.class);
return;
}
@ -71,6 +80,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
{
if (!_holder.getKeyRewards().containsKey(_level) || info.getCollectedKeyRewards().contains(_level) || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level)))
{
player.removeRequest(RewardRequest.class);
return;
}
@ -84,6 +94,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
{
if ((_holder.getSpecialReward() == null) || info.getCollectedSpecialReward() || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level)))
{
player.removeRequest(RewardRequest.class);
return;
}
@ -97,6 +108,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
{
if (!_holder.getBonusRewardIsAvailable() || (_holder.getBonusReward() == null) || !info.getCollectedSpecialReward() || info.getCollectedBonusReward() || ((info.getCurrentLevel() != _level) && (info.getCurrentLevel() < _level)))
{
player.removeRequest(RewardRequest.class);
return;
}
@ -118,6 +130,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
}
else
{
player.removeRequest(RewardRequest.class);
return;
}
}
@ -134,5 +147,7 @@ public class RequestMissionLevelReceiveReward implements ClientPacket
}
player.sendPacket(new ExMissionLevelRewardList(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -65,6 +65,7 @@ public class RequestOneDayRewardReceive implements ClientPacket
final Collection<DailyMissionDataHolder> rewards = DailyMissionData.getInstance().getDailyMissionData(_id);
if ((rewards == null) || rewards.isEmpty())
{
player.removeRequest(RewardRequest.class);
return;
}
@ -79,6 +80,6 @@ public class RequestOneDayRewardReceive implements ClientPacket
player.sendPacket(new ExOneDayReceiveRewardList(player, true));
player.sendPacket(new ExConnectedTimeAndGettableReward(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
}

View File

@ -129,7 +129,7 @@ public class RequestHuntPassReward implements ClientPacket
player.sendPacket(new HuntPassSayhasSupportInfo(player));
player.sendPacket(new HuntPassSimpleInfo(player));
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 50);
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);
}
private void rewardItem(Player player, ItemHolder reward)