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

Olympiad daily mission handler NPE fix.

Browse Source
This commit is contained in:
MobiusDev 2018-02-19 12:35:59 +00:00
parent 71c43313f8
commit 4ebdc09474
4 changed files with 64 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java vendored
View File

@ -73,24 +73,30 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
private void onOlympiadMatchResult(OnOlympiadMatchResult event)
{
final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
if (event.getWinner() != null)
{
if (winnerEntry.increaseProgress() >= _amount)
final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
winnerEntry.setStatus(DailyMissionStatus.AVAILABLE);
if (winnerEntry.increaseProgress() >= _amount)
{
winnerEntry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(winnerEntry);
}
storePlayerEntry(winnerEntry);
}
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
if (event.getLoser() != null)
{
if (loseEntry.increaseProgress() >= _amount)
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
loseEntry.setStatus(DailyMissionStatus.AVAILABLE);
if (loseEntry.increaseProgress() >= _amount)
{
loseEntry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(loseEntry);
}
storePlayerEntry(loseEntry);
}
}
}

26
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java vendored
View File

@ -73,24 +73,30 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
private void onOlympiadMatchResult(OnOlympiadMatchResult event)
{
final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
if (event.getWinner() != null)
{
if (winnerEntry.increaseProgress() >= _amount)
final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
winnerEntry.setStatus(DailyMissionStatus.AVAILABLE);
if (winnerEntry.increaseProgress() >= _amount)
{
winnerEntry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(winnerEntry);
}
storePlayerEntry(winnerEntry);
}
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
if (event.getLoser() != null)
{
if (loseEntry.increaseProgress() >= _amount)
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
loseEntry.setStatus(DailyMissionStatus.AVAILABLE);
if (loseEntry.increaseProgress() >= _amount)
{
loseEntry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(loseEntry);
}
storePlayerEntry(loseEntry);
}
}
}

26
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java vendored
View File

@ -73,24 +73,30 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
private void onOlympiadMatchResult(OnOlympiadMatchResult event)
{
final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
if (event.getWinner() != null)
{
if (winnerEntry.increaseProgress() >= _amount)
final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
winnerEntry.setStatus(DailyMissionStatus.AVAILABLE);
if (winnerEntry.increaseProgress() >= _amount)
{
winnerEntry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(winnerEntry);
}
storePlayerEntry(winnerEntry);
}
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
if (event.getLoser() != null)
{
if (loseEntry.increaseProgress() >= _amount)
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
loseEntry.setStatus(DailyMissionStatus.AVAILABLE);
if (loseEntry.increaseProgress() >= _amount)
{
loseEntry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(loseEntry);
}
storePlayerEntry(loseEntry);
}
}
}

26
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java vendored
View File

@ -73,24 +73,30 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
private void onOlympiadMatchResult(OnOlympiadMatchResult event)
{
final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
if (event.getWinner() != null)
{
if (winnerEntry.increaseProgress() >= _amount)
final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
winnerEntry.setStatus(DailyMissionStatus.AVAILABLE);
if (winnerEntry.increaseProgress() >= _amount)
{
winnerEntry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(winnerEntry);
}
storePlayerEntry(winnerEntry);
}
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
if (event.getLoser() != null)
{
if (loseEntry.increaseProgress() >= _amount)
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
loseEntry.setStatus(DailyMissionStatus.AVAILABLE);
if (loseEntry.increaseProgress() >= _amount)
{
loseEntry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(loseEntry);
}
storePlayerEntry(loseEntry);
}
}
}