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

Fixed probable OlympiadHeroDailyMissionHandler NPE.

Browse Source
This commit is contained in:
MobiusDevelopment
2024-05-02 00:30:34 +03:00
parent 98fe5bc064
commit b81a3e6b7e
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadHeroDailyMissionHandler.java vendored
View File

@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.Containers;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero;
@@ -109,8 +110,14 @@ public class OlympiadHeroDailyMissionHandler extends AbstractDailyMissionHandler
return false; return false;
} }
final int clanMastery = player.getClan().hasMastery(14) ? 14 : player.getClan().hasMastery(15) ? 15 : player.getClan().hasMastery(16) ? 16 : 0; final Clan clan = player.getClan();
return ((player.getClan().getLevel() >= _minClanLevel) && (clanMastery >= _minClanMasteryLevel)); if (clan == null)
{
return false;
}
final int clanMastery = clan.hasMastery(14) ? 14 : clan.hasMastery(15) ? 15 : clan.hasMastery(16) ? 16 : 0;
return ((clan.getLevel() >= _minClanLevel) && (clanMastery >= _minClanMasteryLevel));
} }
private boolean checkRequiredMission(Player player) private boolean checkRequiredMission(Player player)

11
L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadHeroDailyMissionHandler.java vendored
View File

@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.Containers;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero;
@@ -109,8 +110,14 @@ public class OlympiadHeroDailyMissionHandler extends AbstractDailyMissionHandler
return false; return false;
} }
final int clanMastery = player.getClan().hasMastery(14) ? 14 : player.getClan().hasMastery(15) ? 15 : player.getClan().hasMastery(16) ? 16 : 0; final Clan clan = player.getClan();
return ((player.getClan().getLevel() >= _minClanLevel) && (clanMastery >= _minClanMasteryLevel)); if (clan == null)
{
return false;
}
final int clanMastery = clan.hasMastery(14) ? 14 : clan.hasMastery(15) ? 15 : clan.hasMastery(16) ? 16 : 0;
return ((clan.getLevel() >= _minClanLevel) && (clanMastery >= _minClanMasteryLevel));
} }
private boolean checkRequiredMission(Player player) private boolean checkRequiredMission(Player player)

11
L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadHeroDailyMissionHandler.java vendored
View File

@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.Containers;
import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.EventType;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero;
@@ -109,8 +110,14 @@ public class OlympiadHeroDailyMissionHandler extends AbstractDailyMissionHandler
return false; return false;
} }
final int clanMastery = player.getClan().hasMastery(14) ? 14 : player.getClan().hasMastery(15) ? 15 : player.getClan().hasMastery(16) ? 16 : 0; final Clan clan = player.getClan();
return ((player.getClan().getLevel() >= _minClanLevel) && (clanMastery >= _minClanMasteryLevel)); if (clan == null)
{
return false;
}
final int clanMastery = clan.hasMastery(14) ? 14 : clan.hasMastery(15) ? 15 : clan.hasMastery(16) ? 16 : 0;
return ((clan.getLevel() >= _minClanLevel) && (clanMastery >= _minClanMasteryLevel));
} }
private boolean checkRequiredMission(Player player) private boolean checkRequiredMission(Player player)