From 2bf33d5227cdba501513ff2b9d25fb0b2a01db03 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 18 Oct 2019 09:33:36 +0000 Subject: [PATCH] Mission reward id field should be optional. --- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/DailyMissionDataHolder.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index f6c0a0d724..1e473d8213 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -45,7 +45,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index f6c0a0d724..1e473d8213 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -45,7 +45,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index cb3c3d1c3c..91caa42a7e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -48,7 +48,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index cb3c3d1c3c..91caa42a7e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -48,7 +48,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index cb3c3d1c3c..91caa42a7e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -48,7 +48,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index cb3c3d1c3c..91caa42a7e 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -48,7 +48,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index cb3c3d1c3c..91caa42a7e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -48,7 +48,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index f6c0a0d724..1e473d8213 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -45,7 +45,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 0e9df7bd80..1eaff5d6f3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -48,7 +48,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 0e9df7bd80..1eaff5d6f3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -48,7 +48,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 0e9df7bd80..1eaff5d6f3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -48,7 +48,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 0e9df7bd80..1eaff5d6f3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -48,7 +48,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 0e9df7bd80..1eaff5d6f3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -48,7 +48,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 0e9df7bd80..1eaff5d6f3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -48,7 +48,7 @@ public class DailyMissionDataHolder final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id"); + _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class);