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

Addition of ExPledgeMissionInfo constructor for single DailyMissionDataHolder.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-13 02:00:16 +00:00
parent 9cb5f9bf38
commit bc406176af
33 changed files with 115 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java vendored
View File

@@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
{
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
player.sendPacket(new ExPledgeMissionInfo(player, getHolder()));
player.sendPacket(new ExPledgeMissionRewardCount(player));
player.sendPacket(new ExPledgeMissionInfo(player));
}
}
}
}

7
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
/**
* @author Bonux (bonuxq@gmail.com)
* @date 29.09.2019
* @author Bonux
*/
public class RequestExPledgeMissionInfo implements ClientPacket
{
@@ -37,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket
return;
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
}

4
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java
View File

@@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket
if (holder.isDisplayable(player))
{
holder.requestReward(player);
player.sendPacket(new ExPledgeMissionInfo(player, holder));
}
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

7
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.serverpackets.pledgeV2;
import java.util.Collection;
import java.util.Collections;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
@@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket
_rewards = DailyMissionData.getInstance().getDailyMissionData(player);
}
public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder)
{
_player = player;
_rewards = Collections.singletonList(holder);
}
@Override
public void write()
{

5
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
View File

@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
/**
* @author Bonux (bonuxq@gmail.com), NasSeKa
* @date 29.09.2019
**/
* @author Bonux, NasSeKa
*/
public class ExPledgeMissionRewardCount extends ServerPacket
{
private final int _doneMissionsCount;

5
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java vendored
View File

@@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
{
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
player.sendPacket(new ExPledgeMissionInfo(player, getHolder()));
player.sendPacket(new ExPledgeMissionRewardCount(player));
player.sendPacket(new ExPledgeMissionInfo(player));
}
}
}
}

4
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket
return;
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
}

4
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java
View File

@@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket
if (holder.isDisplayable(player))
{
holder.requestReward(player);
player.sendPacket(new ExPledgeMissionInfo(player, holder));
}
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

7
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.serverpackets.pledgeV2;
import java.util.Collection;
import java.util.Collections;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
@@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket
_rewards = DailyMissionData.getInstance().getDailyMissionData(player);
}
public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder)
{
_player = player;
_rewards = Collections.singletonList(holder);
}
@Override
public void write()
{

5
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java vendored
View File

@@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
{
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
player.sendPacket(new ExPledgeMissionInfo(player, getHolder()));
player.sendPacket(new ExPledgeMissionRewardCount(player));
player.sendPacket(new ExPledgeMissionInfo(player));
}
}
}
}

4
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket
return;
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
}

4
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java
View File

@@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket
if (holder.isDisplayable(player))
{
holder.requestReward(player);
player.sendPacket(new ExPledgeMissionInfo(player, holder));
}
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

7
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.serverpackets.pledgeV2;
import java.util.Collection;
import java.util.Collections;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
@@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket
_rewards = DailyMissionData.getInstance().getDailyMissionData(player);
}
public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder)
{
_player = player;
_rewards = Collections.singletonList(holder);
}
@Override
public void write()
{

5
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java vendored
View File

@@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
{
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
player.sendPacket(new ExPledgeMissionInfo(player, getHolder()));
player.sendPacket(new ExPledgeMissionRewardCount(player));
player.sendPacket(new ExPledgeMissionInfo(player));
}
}
}
}

4
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket
return;
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
}

4
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java
View File

@@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket
if (holder.isDisplayable(player))
{
holder.requestReward(player);
player.sendPacket(new ExPledgeMissionInfo(player, holder));
}
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

7
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.serverpackets.pledgeV2;
import java.util.Collection;
import java.util.Collections;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
@@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket
_rewards = DailyMissionData.getInstance().getDailyMissionData(player);
}
public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder)
{
_player = player;
_rewards = Collections.singletonList(holder);
}
@Override
public void write()
{

5
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java vendored
View File

@@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
{
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
player.sendPacket(new ExPledgeMissionInfo(player, getHolder()));
player.sendPacket(new ExPledgeMissionRewardCount(player));
player.sendPacket(new ExPledgeMissionInfo(player));
}
}
}
}

4
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket
return;
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
}

4
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java
View File

@@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket
if (holder.isDisplayable(player))
{
holder.requestReward(player);
player.sendPacket(new ExPledgeMissionInfo(player, holder));
}
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

7
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.serverpackets.pledgeV2;
import java.util.Collection;
import java.util.Collections;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
@@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket
_rewards = DailyMissionData.getInstance().getDailyMissionData(player);
}
public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder)
{
_player = player;
_rewards = Collections.singletonList(holder);
}
@Override
public void write()
{

5
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java vendored
View File

@@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
{
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
player.sendPacket(new ExPledgeMissionInfo(player, getHolder()));
player.sendPacket(new ExPledgeMissionRewardCount(player));
player.sendPacket(new ExPledgeMissionInfo(player));
}
}
}
}

4
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket
return;
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
}

4
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java
View File

@@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket
if (holder.isDisplayable(player))
{
holder.requestReward(player);
player.sendPacket(new ExPledgeMissionInfo(player, holder));
}
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

7
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.serverpackets.pledgeV2;
import java.util.Collection;
import java.util.Collections;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
@@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket
_rewards = DailyMissionData.getInstance().getDailyMissionData(player);
}
public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder)
{
_player = player;
_rewards = Collections.singletonList(holder);
}
@Override
public void write()
{

5
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java vendored
View File

@@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
{
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
player.sendPacket(new ExPledgeMissionInfo(player, getHolder()));
player.sendPacket(new ExPledgeMissionRewardCount(player));
player.sendPacket(new ExPledgeMissionInfo(player));
}
}
}
}

4
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket
return;
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
}

4
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java
View File

@@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket
if (holder.isDisplayable(player))
{
holder.requestReward(player);
player.sendPacket(new ExPledgeMissionInfo(player, holder));
}
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

7
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.serverpackets.pledgeV2;
import java.util.Collection;
import java.util.Collections;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
@@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket
_rewards = DailyMissionData.getInstance().getDailyMissionData(player);
}
public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder)
{
_player = player;
_rewards = Collections.singletonList(holder);
}
@Override
public void write()
{

5
L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java vendored
View File

@@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
{
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
player.sendPacket(new ExPledgeMissionInfo(player, getHolder()));
player.sendPacket(new ExPledgeMissionRewardCount(player));
player.sendPacket(new ExPledgeMissionInfo(player));
}
}
}
}

4
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
View File

@@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket
return;
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
}

4
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java
View File

@@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket
if (holder.isDisplayable(player))
{
holder.requestReward(player);
player.sendPacket(new ExPledgeMissionInfo(player, holder));
}
}
client.sendPacket(new ExPledgeMissionRewardCount(player));
client.sendPacket(new ExPledgeMissionInfo(player));
player.sendPacket(new ExPledgeMissionRewardCount(player));
}
ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

7
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.serverpackets.pledgeV2;
import java.util.Collection;
import java.util.Collections;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
@@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket
_rewards = DailyMissionData.getInstance().getDailyMissionData(player);
}
public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder)
{
_player = player;
_rewards = Collections.singletonList(holder);
}
@Override
public void write()
{