lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed stream usage from AbstractDailyMissionHandler.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-08 20:27:20 +00:00
parent e9246a2a21
commit d04663dce0
2 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
View File

@@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.ListenersContainer;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.holders.MissionLevelPlayerDataHolder; import org.l2jmobius.gameserver.model.holders.MissionLevelPlayerDataHolder;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -124,20 +125,32 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
protected void giveRewards(Player player) protected void giveRewards(Player player)
{ {
_holder.getRewards().stream().filter(i -> i.getId() != MISSION_LEVEL_POINTS).filter(i -> i.getId() != CLAN_EXP).forEach(i -> player.addItem("One Day Reward", i, player, true)); for (ItemHolder holder : _holder.getRewards())
if (_holder.getRewards().stream().anyMatch(i -> i.getId() == CLAN_EXP))
{ {
int points = (int) _holder.getRewards().stream().filter(i -> i.getId() == CLAN_EXP).iterator().next().getCount(); switch (holder.getId())
player.getClan().addExp(player.getObjectId(), points); {
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2).addItemName(MISSION_LEVEL_POINTS).addLong(points)); case CLAN_EXP:
} {
if (_holder.getRewards().stream().anyMatch(i -> i.getId() == MISSION_LEVEL_POINTS)) final int expAmount = (int) holder.getCount();
{ player.getClan().addExp(player.getObjectId(), expAmount);
final MissionLevelPlayerDataHolder info = player.getMissionLevelProgress(); player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2).addItemName(MISSION_LEVEL_POINTS).addLong(expAmount));
final int points = (int) _holder.getRewards().stream().filter(i -> i.getId() == MISSION_LEVEL_POINTS).iterator().next().getCount(); break;
info.calculateEXP(points); }
info.storeInfoInVariable(player); case MISSION_LEVEL_POINTS:
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2).addItemName(MISSION_LEVEL_POINTS).addLong(points)); {
final int levelPoints = (int) holder.getCount();
final MissionLevelPlayerDataHolder info = player.getMissionLevelProgress();
info.calculateEXP(levelPoints);
info.storeInfoInVariable(player);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2).addItemName(MISSION_LEVEL_POINTS).addLong(levelPoints));
break;
}
default:
{
player.addItem("One Day Reward", holder, player, true);
break;
}
}
} }
} }

39
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
View File

@@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.ListenersContainer;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.holders.MissionLevelPlayerDataHolder; import org.l2jmobius.gameserver.model.holders.MissionLevelPlayerDataHolder;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -124,20 +125,32 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
protected void giveRewards(Player player) protected void giveRewards(Player player)
{ {
_holder.getRewards().stream().filter(i -> i.getId() != MISSION_LEVEL_POINTS).filter(i -> i.getId() != CLAN_EXP).forEach(i -> player.addItem("One Day Reward", i, player, true)); for (ItemHolder holder : _holder.getRewards())
if (_holder.getRewards().stream().anyMatch(i -> i.getId() == CLAN_EXP))
{ {
int points = (int) _holder.getRewards().stream().filter(i -> i.getId() == CLAN_EXP).iterator().next().getCount(); switch (holder.getId())
player.getClan().addExp(player.getObjectId(), points); {
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2).addItemName(MISSION_LEVEL_POINTS).addLong(points)); case CLAN_EXP:
} {
if (_holder.getRewards().stream().anyMatch(i -> i.getId() == MISSION_LEVEL_POINTS)) final int expAmount = (int) holder.getCount();
{ player.getClan().addExp(player.getObjectId(), expAmount);
final MissionLevelPlayerDataHolder info = player.getMissionLevelProgress(); player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2).addItemName(MISSION_LEVEL_POINTS).addLong(expAmount));
final int points = (int) _holder.getRewards().stream().filter(i -> i.getId() == MISSION_LEVEL_POINTS).iterator().next().getCount(); break;
info.calculateEXP(points); }
info.storeInfoInVariable(player); case MISSION_LEVEL_POINTS:
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2).addItemName(MISSION_LEVEL_POINTS).addLong(points)); {
final int levelPoints = (int) holder.getCount();
final MissionLevelPlayerDataHolder info = player.getMissionLevelProgress();
info.calculateEXP(levelPoints);
info.storeInfoInVariable(player);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2).addItemName(MISSION_LEVEL_POINTS).addLong(levelPoints));
break;
}
default:
{
player.addItem("One Day Reward", holder, player, true);
break;
}
}
} }
} }