From 4ebdc0947443b34b8e0f1f5910aabf8692dbfbf2 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 19 Feb 2018 12:35:59 +0000 Subject: [PATCH] Olympiad daily mission handler NPE fix. --- .../OlympiadDailyMissionHandler.java | 26 ++++++++++++------- .../OlympiadDailyMissionHandler.java | 26 ++++++++++++------- .../OlympiadDailyMissionHandler.java | 26 ++++++++++++------- .../OlympiadDailyMissionHandler.java | 26 ++++++++++++------- 4 files changed, 64 insertions(+), 40 deletions(-) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java index 111c8c0c30..341db62879 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java @@ -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); } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java index 111c8c0c30..341db62879 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java @@ -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); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java index 111c8c0c30..341db62879 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java @@ -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); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java index 111c8c0c30..341db62879 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java @@ -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); } } }