Daily mission additions and adjustments.

This commit is contained in:
MobiusDevelopment 2019-10-10 12:09:45 +00:00
parent c04800b6d0
commit ccfc8c569c
54 changed files with 2087 additions and 2180 deletions

View File

@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final int _minLevel;
private final int _maxLevel;
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
private void onPlayerFishing(OnPlayerFishing event)
{
final PlayerInstance player = event.getPlayer();
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
if (event.getReason() == FishingEndReason.WIN)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);

View File

@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final boolean _winOnly;
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_winOnly = holder.getParams().getBoolean("winOnly", false);
}
@Override
@ -86,7 +88,7 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
}
}
if (event.getLoser() != null)
if (!_winOnly && (event.getLoser() != null))
{
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)

View File

@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
*/
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _minLevel;
private final int _maxLevel;
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);

View File

@ -18,7 +18,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="id" />
<xs:attribute type="xs:byte" name="count" />
<xs:attribute type="xs:int" name="count" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>

View File

@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final int _minLevel;
private final int _maxLevel;
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
private void onPlayerFishing(OnPlayerFishing event)
{
final PlayerInstance player = event.getPlayer();
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
if (event.getReason() == FishingEndReason.WIN)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);

View File

@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final boolean _winOnly;
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_winOnly = holder.getParams().getBoolean("winOnly", false);
}
@Override
@ -86,7 +88,7 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
}
}
if (event.getLoser() != null)
if (!_winOnly && (event.getLoser() != null))
{
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)

View File

@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
*/
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _minLevel;
private final int _maxLevel;
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);

View File

@ -18,7 +18,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="id" />
<xs:attribute type="xs:byte" name="count" />
<xs:attribute type="xs:int" name="count" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>

View File

@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final int _minLevel;
private final int _maxLevel;
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
private void onPlayerFishing(OnPlayerFishing event)
{
final PlayerInstance player = event.getPlayer();
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
if (event.getReason() == FishingEndReason.WIN)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);

View File

@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final boolean _winOnly;
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_winOnly = holder.getParams().getBoolean("winOnly", false);
}
@Override
@ -86,7 +88,7 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
}
}
if (event.getLoser() != null)
if (!_winOnly && (event.getLoser() != null))
{
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)

View File

@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
*/
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _minLevel;
private final int _maxLevel;
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);

View File

@ -18,7 +18,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="id" />
<xs:attribute type="xs:byte" name="count" />
<xs:attribute type="xs:int" name="count" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>

View File

@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final int _minLevel;
private final int _maxLevel;
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
private void onPlayerFishing(OnPlayerFishing event)
{
final PlayerInstance player = event.getPlayer();
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
if (event.getReason() == FishingEndReason.WIN)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);

View File

@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final boolean _winOnly;
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_winOnly = holder.getParams().getBoolean("winOnly", false);
}
@Override
@ -86,7 +88,7 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
}
}
if (event.getLoser() != null)
if (!_winOnly && (event.getLoser() != null))
{
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)

View File

@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
*/
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _minLevel;
private final int _maxLevel;
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);

View File

@ -18,7 +18,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="id" />
<xs:attribute type="xs:byte" name="count" />
<xs:attribute type="xs:int" name="count" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>

View File

@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final int _minLevel;
private final int _maxLevel;
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
private void onPlayerFishing(OnPlayerFishing event)
{
final PlayerInstance player = event.getPlayer();
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
if (event.getReason() == FishingEndReason.WIN)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);

View File

@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final boolean _winOnly;
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_winOnly = holder.getParams().getBoolean("winOnly", false);
}
@Override
@ -86,7 +88,7 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
}
}
if (event.getLoser() != null)
if (!_winOnly && (event.getLoser() != null))
{
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)

View File

@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
*/
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _minLevel;
private final int _maxLevel;
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);

View File

@ -18,7 +18,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="id" />
<xs:attribute type="xs:byte" name="count" />
<xs:attribute type="xs:int" name="count" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>

View File

@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final int _minLevel;
private final int _maxLevel;
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
private void onPlayerFishing(OnPlayerFishing event)
{
final PlayerInstance player = event.getPlayer();
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
if (event.getReason() == FishingEndReason.WIN)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);

View File

@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final boolean _winOnly;
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_winOnly = holder.getParams().getBoolean("winOnly", false);
}
@Override
@ -86,7 +88,7 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
}
}
if (event.getLoser() != null)
if (!_winOnly && (event.getLoser() != null))
{
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)

View File

@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
*/
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _minLevel;
private final int _maxLevel;
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);

View File

@ -18,7 +18,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="id" />
<xs:attribute type="xs:byte" name="count" />
<xs:attribute type="xs:int" name="count" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>

View File

@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final int _minLevel;
private final int _maxLevel;
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
private void onPlayerFishing(OnPlayerFishing event)
{
final PlayerInstance player = event.getPlayer();
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
if (event.getReason() == FishingEndReason.WIN)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);

View File

@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final boolean _winOnly;
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_winOnly = holder.getParams().getBoolean("winOnly", false);
}
@Override
@ -86,7 +88,7 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
}
}
if (event.getLoser() != null)
if (!_winOnly && (event.getLoser() != null))
{
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)

View File

@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
*/
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _minLevel;
private final int _maxLevel;
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);

View File

@ -18,7 +18,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="id" />
<xs:attribute type="xs:byte" name="count" />
<xs:attribute type="xs:int" name="count" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>

View File

@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final int _minLevel;
private final int _maxLevel;
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
private void onPlayerFishing(OnPlayerFishing event)
{
final PlayerInstance player = event.getPlayer();
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
if (event.getReason() == FishingEndReason.WIN)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);

View File

@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final boolean _winOnly;
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_winOnly = holder.getParams().getBoolean("winOnly", false);
}
@Override
@ -86,7 +88,7 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
}
}
if (event.getLoser() != null)
if (!_winOnly && (event.getLoser() != null))
{
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)

View File

@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
*/
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _minLevel;
private final int _maxLevel;
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);

View File

@ -18,7 +18,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="id" />
<xs:attribute type="xs:byte" name="count" />
<xs:attribute type="xs:int" name="count" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>

View File

@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final int _minLevel;
private final int _maxLevel;
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
private void onPlayerFishing(OnPlayerFishing event)
{
final PlayerInstance player = event.getPlayer();
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
if (event.getReason() == FishingEndReason.WIN)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);

View File

@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final boolean _winOnly;
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_winOnly = holder.getParams().getBoolean("winOnly", false);
}
@Override
@ -86,7 +88,7 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
}
}
if (event.getLoser() != null)
if (!_winOnly && (event.getLoser() != null))
{
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)

View File

@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
*/
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _minLevel;
private final int _maxLevel;
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);

View File

@ -18,7 +18,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="id" />
<xs:attribute type="xs:byte" name="count" />
<xs:attribute type="xs:int" name="count" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>

View File

@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final int _minLevel;
private final int _maxLevel;
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
private void onPlayerFishing(OnPlayerFishing event)
{
final PlayerInstance player = event.getPlayer();
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
if (event.getReason() == FishingEndReason.WIN)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);

View File

@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final boolean _winOnly;
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_winOnly = holder.getParams().getBoolean("winOnly", false);
}
@Override
@ -86,7 +88,7 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
}
}
if (event.getLoser() != null)
if (!_winOnly && (event.getLoser() != null))
{
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)

View File

@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
*/
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _minLevel;
private final int _maxLevel;
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);

View File

@ -18,7 +18,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="id" />
<xs:attribute type="xs:byte" name="count" />
<xs:attribute type="xs:int" name="count" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>

View File

@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final int _minLevel;
private final int _maxLevel;
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
private void onPlayerFishing(OnPlayerFishing event)
{
final PlayerInstance player = event.getPlayer();
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
if (event.getReason() == FishingEndReason.WIN)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);

View File

@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final boolean _winOnly;
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_winOnly = holder.getParams().getBoolean("winOnly", false);
}
@Override
@ -86,7 +88,7 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
}
}
if (event.getLoser() != null)
if (!_winOnly && (event.getLoser() != null))
{
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)

View File

@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
*/
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _minLevel;
private final int _maxLevel;
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);

View File

@ -18,7 +18,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="id" />
<xs:attribute type="xs:byte" name="count" />
<xs:attribute type="xs:int" name="count" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>

File diff suppressed because it is too large Load Diff

View File

@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final int _minLevel;
private final int _maxLevel;
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
private void onPlayerFishing(OnPlayerFishing event)
{
final PlayerInstance player = event.getPlayer();
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
if (event.getReason() == FishingEndReason.WIN)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);

View File

@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final boolean _winOnly;
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_winOnly = holder.getParams().getBoolean("winOnly", false);
}
@Override
@ -86,7 +88,7 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
}
}
if (event.getLoser() != null)
if (!_winOnly && (event.getLoser() != null))
{
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)

View File

@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
*/
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _minLevel;
private final int _maxLevel;
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);

View File

@ -18,7 +18,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="id" />
<xs:attribute type="xs:byte" name="count" />
<xs:attribute type="xs:int" name="count" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>

File diff suppressed because it is too large Load Diff

View File

@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final int _minLevel;
private final int _maxLevel;
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
private void onPlayerFishing(OnPlayerFishing event)
{
final PlayerInstance player = event.getPlayer();
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
if (event.getReason() == FishingEndReason.WIN)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);

View File

@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
private final boolean _winOnly;
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
_winOnly = holder.getParams().getBoolean("winOnly", false);
}
@Override
@ -86,7 +88,7 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
}
}
if (event.getLoser() != null)
if (!_winOnly && (event.getLoser() != null))
{
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)

View File

@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
*/
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _minLevel;
private final int _maxLevel;
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_minLevel = holder.getParams().getInt("minLevel", 0);
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
}
@Override
@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
{
return;
}
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);

View File

@ -18,7 +18,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="id" />
<xs:attribute type="xs:byte" name="count" />
<xs:attribute type="xs:int" name="count" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>