Daily mission additions and adjustments.
This commit is contained in:
@@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
|
|||||||
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerFishing(OnPlayerFishing event)
|
private void onPlayerFishing(OnPlayerFishing event)
|
||||||
{
|
{
|
||||||
final PlayerInstance player = event.getPlayer();
|
final PlayerInstance player = event.getPlayer();
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.getReason() == FishingEndReason.WIN)
|
if (event.getReason() == FishingEndReason.WIN)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
|
@@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final boolean _winOnly;
|
||||||
|
|
||||||
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_winOnly = holder.getParams().getBoolean("winOnly", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
|
||||||
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
||||||
|
@@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
*/
|
*/
|
||||||
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
{
|
{
|
||||||
clan.getOnlineMembers(0).forEach(player ->
|
clan.getOnlineMembers(0).forEach(player ->
|
||||||
{
|
{
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<xs:simpleContent>
|
<xs:simpleContent>
|
||||||
<xs:extension base="xs:string">
|
<xs:extension base="xs:string">
|
||||||
<xs:attribute type="xs:int" name="id" />
|
<xs:attribute type="xs:int" name="id" />
|
||||||
<xs:attribute type="xs:byte" name="count" />
|
<xs:attribute type="xs:int" name="count" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
@@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
|
|||||||
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerFishing(OnPlayerFishing event)
|
private void onPlayerFishing(OnPlayerFishing event)
|
||||||
{
|
{
|
||||||
final PlayerInstance player = event.getPlayer();
|
final PlayerInstance player = event.getPlayer();
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.getReason() == FishingEndReason.WIN)
|
if (event.getReason() == FishingEndReason.WIN)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
|
@@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final boolean _winOnly;
|
||||||
|
|
||||||
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_winOnly = holder.getParams().getBoolean("winOnly", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
|
||||||
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
||||||
|
@@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
*/
|
*/
|
||||||
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
{
|
{
|
||||||
clan.getOnlineMembers(0).forEach(player ->
|
clan.getOnlineMembers(0).forEach(player ->
|
||||||
{
|
{
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<xs:simpleContent>
|
<xs:simpleContent>
|
||||||
<xs:extension base="xs:string">
|
<xs:extension base="xs:string">
|
||||||
<xs:attribute type="xs:int" name="id" />
|
<xs:attribute type="xs:int" name="id" />
|
||||||
<xs:attribute type="xs:byte" name="count" />
|
<xs:attribute type="xs:int" name="count" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
@@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
|
|||||||
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerFishing(OnPlayerFishing event)
|
private void onPlayerFishing(OnPlayerFishing event)
|
||||||
{
|
{
|
||||||
final PlayerInstance player = event.getPlayer();
|
final PlayerInstance player = event.getPlayer();
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.getReason() == FishingEndReason.WIN)
|
if (event.getReason() == FishingEndReason.WIN)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
|
@@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final boolean _winOnly;
|
||||||
|
|
||||||
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_winOnly = holder.getParams().getBoolean("winOnly", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
|
||||||
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
||||||
|
@@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
*/
|
*/
|
||||||
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
{
|
{
|
||||||
clan.getOnlineMembers(0).forEach(player ->
|
clan.getOnlineMembers(0).forEach(player ->
|
||||||
{
|
{
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<xs:simpleContent>
|
<xs:simpleContent>
|
||||||
<xs:extension base="xs:string">
|
<xs:extension base="xs:string">
|
||||||
<xs:attribute type="xs:int" name="id" />
|
<xs:attribute type="xs:int" name="id" />
|
||||||
<xs:attribute type="xs:byte" name="count" />
|
<xs:attribute type="xs:int" name="count" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
@@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
|
|||||||
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerFishing(OnPlayerFishing event)
|
private void onPlayerFishing(OnPlayerFishing event)
|
||||||
{
|
{
|
||||||
final PlayerInstance player = event.getPlayer();
|
final PlayerInstance player = event.getPlayer();
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.getReason() == FishingEndReason.WIN)
|
if (event.getReason() == FishingEndReason.WIN)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
|
@@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final boolean _winOnly;
|
||||||
|
|
||||||
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_winOnly = holder.getParams().getBoolean("winOnly", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
|
||||||
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
||||||
|
@@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
*/
|
*/
|
||||||
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
{
|
{
|
||||||
clan.getOnlineMembers(0).forEach(player ->
|
clan.getOnlineMembers(0).forEach(player ->
|
||||||
{
|
{
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<xs:simpleContent>
|
<xs:simpleContent>
|
||||||
<xs:extension base="xs:string">
|
<xs:extension base="xs:string">
|
||||||
<xs:attribute type="xs:int" name="id" />
|
<xs:attribute type="xs:int" name="id" />
|
||||||
<xs:attribute type="xs:byte" name="count" />
|
<xs:attribute type="xs:int" name="count" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
@@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
|
|||||||
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerFishing(OnPlayerFishing event)
|
private void onPlayerFishing(OnPlayerFishing event)
|
||||||
{
|
{
|
||||||
final PlayerInstance player = event.getPlayer();
|
final PlayerInstance player = event.getPlayer();
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.getReason() == FishingEndReason.WIN)
|
if (event.getReason() == FishingEndReason.WIN)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
|
@@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final boolean _winOnly;
|
||||||
|
|
||||||
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_winOnly = holder.getParams().getBoolean("winOnly", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
|
||||||
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
||||||
|
@@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
*/
|
*/
|
||||||
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
{
|
{
|
||||||
clan.getOnlineMembers(0).forEach(player ->
|
clan.getOnlineMembers(0).forEach(player ->
|
||||||
{
|
{
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<xs:simpleContent>
|
<xs:simpleContent>
|
||||||
<xs:extension base="xs:string">
|
<xs:extension base="xs:string">
|
||||||
<xs:attribute type="xs:int" name="id" />
|
<xs:attribute type="xs:int" name="id" />
|
||||||
<xs:attribute type="xs:byte" name="count" />
|
<xs:attribute type="xs:int" name="count" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
@@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
|
|||||||
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerFishing(OnPlayerFishing event)
|
private void onPlayerFishing(OnPlayerFishing event)
|
||||||
{
|
{
|
||||||
final PlayerInstance player = event.getPlayer();
|
final PlayerInstance player = event.getPlayer();
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.getReason() == FishingEndReason.WIN)
|
if (event.getReason() == FishingEndReason.WIN)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
|
@@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final boolean _winOnly;
|
||||||
|
|
||||||
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_winOnly = holder.getParams().getBoolean("winOnly", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
|
||||||
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
||||||
|
@@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
*/
|
*/
|
||||||
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
{
|
{
|
||||||
clan.getOnlineMembers(0).forEach(player ->
|
clan.getOnlineMembers(0).forEach(player ->
|
||||||
{
|
{
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<xs:simpleContent>
|
<xs:simpleContent>
|
||||||
<xs:extension base="xs:string">
|
<xs:extension base="xs:string">
|
||||||
<xs:attribute type="xs:int" name="id" />
|
<xs:attribute type="xs:int" name="id" />
|
||||||
<xs:attribute type="xs:byte" name="count" />
|
<xs:attribute type="xs:int" name="count" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
@@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
|
|||||||
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerFishing(OnPlayerFishing event)
|
private void onPlayerFishing(OnPlayerFishing event)
|
||||||
{
|
{
|
||||||
final PlayerInstance player = event.getPlayer();
|
final PlayerInstance player = event.getPlayer();
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.getReason() == FishingEndReason.WIN)
|
if (event.getReason() == FishingEndReason.WIN)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
|
@@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final boolean _winOnly;
|
||||||
|
|
||||||
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_winOnly = holder.getParams().getBoolean("winOnly", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
|
||||||
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
||||||
|
@@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
*/
|
*/
|
||||||
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
{
|
{
|
||||||
clan.getOnlineMembers(0).forEach(player ->
|
clan.getOnlineMembers(0).forEach(player ->
|
||||||
{
|
{
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<xs:simpleContent>
|
<xs:simpleContent>
|
||||||
<xs:extension base="xs:string">
|
<xs:extension base="xs:string">
|
||||||
<xs:attribute type="xs:int" name="id" />
|
<xs:attribute type="xs:int" name="id" />
|
||||||
<xs:attribute type="xs:byte" name="count" />
|
<xs:attribute type="xs:int" name="count" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
@@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
|
|||||||
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerFishing(OnPlayerFishing event)
|
private void onPlayerFishing(OnPlayerFishing event)
|
||||||
{
|
{
|
||||||
final PlayerInstance player = event.getPlayer();
|
final PlayerInstance player = event.getPlayer();
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.getReason() == FishingEndReason.WIN)
|
if (event.getReason() == FishingEndReason.WIN)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
|
@@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final boolean _winOnly;
|
||||||
|
|
||||||
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_winOnly = holder.getParams().getBoolean("winOnly", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
|
||||||
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
||||||
|
@@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
*/
|
*/
|
||||||
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
{
|
{
|
||||||
clan.getOnlineMembers(0).forEach(player ->
|
clan.getOnlineMembers(0).forEach(player ->
|
||||||
{
|
{
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<xs:simpleContent>
|
<xs:simpleContent>
|
||||||
<xs:extension base="xs:string">
|
<xs:extension base="xs:string">
|
||||||
<xs:attribute type="xs:int" name="id" />
|
<xs:attribute type="xs:int" name="id" />
|
||||||
<xs:attribute type="xs:byte" name="count" />
|
<xs:attribute type="xs:int" name="count" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
@@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
|
|||||||
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerFishing(OnPlayerFishing event)
|
private void onPlayerFishing(OnPlayerFishing event)
|
||||||
{
|
{
|
||||||
final PlayerInstance player = event.getPlayer();
|
final PlayerInstance player = event.getPlayer();
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.getReason() == FishingEndReason.WIN)
|
if (event.getReason() == FishingEndReason.WIN)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
|
@@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final boolean _winOnly;
|
||||||
|
|
||||||
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_winOnly = holder.getParams().getBoolean("winOnly", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
|
||||||
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
||||||
|
@@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
*/
|
*/
|
||||||
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
{
|
{
|
||||||
clan.getOnlineMembers(0).forEach(player ->
|
clan.getOnlineMembers(0).forEach(player ->
|
||||||
{
|
{
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<xs:simpleContent>
|
<xs:simpleContent>
|
||||||
<xs:extension base="xs:string">
|
<xs:extension base="xs:string">
|
||||||
<xs:attribute type="xs:int" name="id" />
|
<xs:attribute type="xs:int" name="id" />
|
||||||
<xs:attribute type="xs:byte" name="count" />
|
<xs:attribute type="xs:int" name="count" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
@@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
|
|||||||
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerFishing(OnPlayerFishing event)
|
private void onPlayerFishing(OnPlayerFishing event)
|
||||||
{
|
{
|
||||||
final PlayerInstance player = event.getPlayer();
|
final PlayerInstance player = event.getPlayer();
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.getReason() == FishingEndReason.WIN)
|
if (event.getReason() == FishingEndReason.WIN)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
|
@@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final boolean _winOnly;
|
||||||
|
|
||||||
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_winOnly = holder.getParams().getBoolean("winOnly", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
|
||||||
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
||||||
|
@@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
*/
|
*/
|
||||||
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
{
|
{
|
||||||
clan.getOnlineMembers(0).forEach(player ->
|
clan.getOnlineMembers(0).forEach(player ->
|
||||||
{
|
{
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<xs:simpleContent>
|
<xs:simpleContent>
|
||||||
<xs:extension base="xs:string">
|
<xs:extension base="xs:string">
|
||||||
<xs:attribute type="xs:int" name="id" />
|
<xs:attribute type="xs:int" name="id" />
|
||||||
<xs:attribute type="xs:byte" name="count" />
|
<xs:attribute type="xs:int" name="count" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
@@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
|
|||||||
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerFishing(OnPlayerFishing event)
|
private void onPlayerFishing(OnPlayerFishing event)
|
||||||
{
|
{
|
||||||
final PlayerInstance player = event.getPlayer();
|
final PlayerInstance player = event.getPlayer();
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.getReason() == FishingEndReason.WIN)
|
if (event.getReason() == FishingEndReason.WIN)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
|
@@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final boolean _winOnly;
|
||||||
|
|
||||||
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_winOnly = holder.getParams().getBoolean("winOnly", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
|
||||||
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
||||||
|
@@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
*/
|
*/
|
||||||
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
{
|
{
|
||||||
clan.getOnlineMembers(0).forEach(player ->
|
clan.getOnlineMembers(0).forEach(player ->
|
||||||
{
|
{
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<xs:simpleContent>
|
<xs:simpleContent>
|
||||||
<xs:extension base="xs:string">
|
<xs:extension base="xs:string">
|
||||||
<xs:attribute type="xs:int" name="id" />
|
<xs:attribute type="xs:int" name="id" />
|
||||||
<xs:attribute type="xs:byte" name="count" />
|
<xs:attribute type="xs:int" name="count" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
|
|||||||
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerFishing(OnPlayerFishing event)
|
private void onPlayerFishing(OnPlayerFishing event)
|
||||||
{
|
{
|
||||||
final PlayerInstance player = event.getPlayer();
|
final PlayerInstance player = event.getPlayer();
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.getReason() == FishingEndReason.WIN)
|
if (event.getReason() == FishingEndReason.WIN)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
|
@@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final boolean _winOnly;
|
||||||
|
|
||||||
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_winOnly = holder.getParams().getBoolean("winOnly", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
|
||||||
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
||||||
|
@@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
*/
|
*/
|
||||||
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
{
|
{
|
||||||
clan.getOnlineMembers(0).forEach(player ->
|
clan.getOnlineMembers(0).forEach(player ->
|
||||||
{
|
{
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<xs:simpleContent>
|
<xs:simpleContent>
|
||||||
<xs:extension base="xs:string">
|
<xs:extension base="xs:string">
|
||||||
<xs:attribute type="xs:int" name="id" />
|
<xs:attribute type="xs:int" name="id" />
|
||||||
<xs:attribute type="xs:byte" name="count" />
|
<xs:attribute type="xs:int" name="count" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -33,11 +33,15 @@ import org.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
|
|||||||
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +79,11 @@ public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerFishing(OnPlayerFishing event)
|
private void onPlayerFishing(OnPlayerFishing event)
|
||||||
{
|
{
|
||||||
final PlayerInstance player = event.getPlayer();
|
final PlayerInstance player = event.getPlayer();
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (event.getReason() == FishingEndReason.WIN)
|
if (event.getReason() == FishingEndReason.WIN)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
|
@@ -32,11 +32,13 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
private final int _amount;
|
private final int _amount;
|
||||||
|
private final boolean _winOnly;
|
||||||
|
|
||||||
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
_amount = holder.getRequiredCompletions();
|
_amount = holder.getRequiredCompletions();
|
||||||
|
_winOnly = holder.getParams().getBoolean("winOnly", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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);
|
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
|
||||||
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
|
||||||
|
@@ -34,9 +34,14 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
|||||||
*/
|
*/
|
||||||
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
||||||
{
|
{
|
||||||
|
private final int _minLevel;
|
||||||
|
private final int _maxLevel;
|
||||||
|
|
||||||
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
|
||||||
{
|
{
|
||||||
super(holder);
|
super(holder);
|
||||||
|
_minLevel = holder.getParams().getInt("minLevel", 0);
|
||||||
|
_maxLevel = holder.getParams().getInt("maxLevel", Byte.MAX_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -75,6 +80,11 @@ public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
{
|
{
|
||||||
clan.getOnlineMembers(0).forEach(player ->
|
clan.getOnlineMembers(0).forEach(player ->
|
||||||
{
|
{
|
||||||
|
if ((player.getLevel() < _minLevel) || (player.getLevel() > _maxLevel))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
<xs:simpleContent>
|
<xs:simpleContent>
|
||||||
<xs:extension base="xs:string">
|
<xs:extension base="xs:string">
|
||||||
<xs:attribute type="xs:int" name="id" />
|
<xs:attribute type="xs:int" name="id" />
|
||||||
<xs:attribute type="xs:byte" name="count" />
|
<xs:attribute type="xs:int" name="count" />
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:simpleContent>
|
</xs:simpleContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
Reference in New Issue
Block a user