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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,8 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
} }
private void onOlympiadMatchResult(OnOlympiadMatchResult event) private void onOlympiadMatchResult(OnOlympiadMatchResult event)
{
if (event.getWinner() != null)
{ {
final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true); final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE) if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
@@ -82,7 +84,10 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
} }
storePlayerEntry(winnerEntry); storePlayerEntry(winnerEntry);
} }
}
if (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)
{ {
@@ -94,3 +99,4 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
} }
} }
} }
}

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

@@ -72,6 +72,8 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
} }
private void onOlympiadMatchResult(OnOlympiadMatchResult event) private void onOlympiadMatchResult(OnOlympiadMatchResult event)
{
if (event.getWinner() != null)
{ {
final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true); final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE) if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
@@ -82,7 +84,10 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
} }
storePlayerEntry(winnerEntry); storePlayerEntry(winnerEntry);
} }
}
if (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)
{ {
@@ -94,3 +99,4 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
} }
} }
} }
}

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

@@ -72,6 +72,8 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
} }
private void onOlympiadMatchResult(OnOlympiadMatchResult event) private void onOlympiadMatchResult(OnOlympiadMatchResult event)
{
if (event.getWinner() != null)
{ {
final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true); final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE) if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
@@ -82,7 +84,10 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
} }
storePlayerEntry(winnerEntry); storePlayerEntry(winnerEntry);
} }
}
if (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)
{ {
@@ -94,3 +99,4 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
} }
} }
} }
}

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

@@ -72,6 +72,8 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
} }
private void onOlympiadMatchResult(OnOlympiadMatchResult event) private void onOlympiadMatchResult(OnOlympiadMatchResult event)
{
if (event.getWinner() != null)
{ {
final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true); final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE) if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
@@ -82,7 +84,10 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
} }
storePlayerEntry(winnerEntry); storePlayerEntry(winnerEntry);
} }
}
if (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)
{ {
@@ -94,3 +99,4 @@ public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
} }
} }
} }
}