Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-12-24 01:58:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #554 from BerndiVader/master

Browse Source 
Fix for npe's in custom-modules datamap
This commit is contained in:
FlyingPikachu 2018-12-05 12:06:51 -05:00 committed by GitHub
commit 2bfe3b0ec5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/main/java/me/blackvein/quests/Quests.java
View File

@ -36,6 +36,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
@ -2495,26 +2496,23 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
ConfigurationSection sec = config.getConfigurationSection("quests." + questName + ".requirements.custom-requirements"); ConfigurationSection sec = config.getConfigurationSection("quests." + questName + ".requirements.custom-requirements");
for (String path : sec.getKeys(false)) { for (String path : sec.getKeys(false)) {
String name = sec.getString(path + ".name"); String name = sec.getString(path + ".name");
boolean found = false; Optional<CustomRequirement>found=Optional.empty();
for (CustomRequirement cr : customRequirements) { for (CustomRequirement cr : customRequirements) {
if (cr.getName().equalsIgnoreCase(name)) { if (cr.getName().equalsIgnoreCase(name)) {
found = true; found=Optional.of(cr);
break; break;
} }
} }
if (!found) { if (!found.isPresent()) {
getLogger().warning("Custom requirement \"" + name + "\" for Quest \"" + quest.name + "\" could not be found!"); getLogger().warning("Custom requirement \"" + name + "\" for Quest \"" + quest.name + "\" could not be found!");
skipQuestProcess((String) null); // null bc we warn, not severe for this one skipQuestProcess((String) null); // null bc we warn, not severe for this one
} }else {
Map<String, Object> data = new HashMap<String, Object>();
ConfigurationSection sec2 = sec.getConfigurationSection(path + ".data"); ConfigurationSection sec2 = sec.getConfigurationSection(path + ".data");
if (sec2 != null) { Map<String, Object> data=populateCustoms(sec2,found.get().datamap);
for (String dataPath : sec2.getKeys(false)) {
data.put(dataPath, sec2.get(dataPath));
}
}
quest.customRequirements.put(name, data); quest.customRequirements.put(name, data);
} }
}
} }
} }
@ -2562,27 +2560,23 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
ConfigurationSection sec = config.getConfigurationSection("quests." + questName + ".rewards.custom-rewards"); ConfigurationSection sec = config.getConfigurationSection("quests." + questName + ".rewards.custom-rewards");
for (String path : sec.getKeys(false)) { for (String path : sec.getKeys(false)) {
String name = sec.getString(path + ".name"); String name = sec.getString(path + ".name");
boolean found = false; Optional<CustomReward>found = Optional.empty();
for (CustomReward cr : customRewards) { for (CustomReward cr : customRewards) {
if (cr.getName().equalsIgnoreCase(name)) { if (cr.getName().equalsIgnoreCase(name)) {
found = true; found=Optional.of(cr);
break; break;
} }
} }
if (!found) { if (!found.isPresent()) {
getLogger().warning("Custom reward \"" + name + "\" for Quest \"" + quest.name + "\" could not be found!"); getLogger().warning("Custom reward \"" + name + "\" for Quest \"" + quest.name + "\" could not be found!");
continue; continue;
} } else {
Map<String, Object> data = new HashMap<String, Object>();
ConfigurationSection sec2 = sec.getConfigurationSection(path + ".data"); ConfigurationSection sec2 = sec.getConfigurationSection(path + ".data");
if (sec2 != null) { Map<String, Object> data=populateCustoms(sec2,found.get().datamap);
for (String dataPath : sec2.getKeys(false)) {
data.put(dataPath, sec2.get(dataPath));
}
}
quest.customRewards.put(name, data); quest.customRewards.put(name, data);
} }
} }
}
private boolean regionFound(Quest quest, String region) { private boolean regionFound(Quest quest, String region) {
boolean exists = false; boolean exists = false;
@ -3189,29 +3183,26 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
for (String path : sec.getKeys(false)) { for (String path : sec.getKeys(false)) {
String name = sec.getString(path + ".name"); String name = sec.getString(path + ".name");
int count = sec.getInt(path + ".count"); int count = sec.getInt(path + ".count");
CustomObjective found = null; Optional<CustomObjective> found = Optional.empty();
for (CustomObjective cr : customObjectives) { for (CustomObjective cr : customObjectives) {
if (cr.getName().equalsIgnoreCase(name)) { if (cr.getName().equalsIgnoreCase(name)) {
found = cr; found = Optional.of(cr);
break; break;
} }
} }
if (found == null) { if (!found.isPresent()) {
getLogger().warning("Custom objective \"" + name + "\" for Stage " + s2 + " of Quest \"" + quest.name + "\" could not be found!"); getLogger().warning("Custom objective \"" + name + "\" for Stage " + s2 + " of Quest \"" + quest.name + "\" could not be found!");
continue; continue;
} } else {
Map<String, Object> data = new HashMap<String, Object>();
ConfigurationSection sec2 = sec.getConfigurationSection(path + ".data"); ConfigurationSection sec2 = sec.getConfigurationSection(path + ".data");
if (sec2 != null) { Map<String, Object> data=populateCustoms(sec2,found.get().datamap);
for (String dataPath : sec2.getKeys(false)) {
data.put(dataPath, sec2.get(dataPath)); oStage.customObjectives.add(found.get());
}
}
oStage.customObjectives.add(found);
oStage.customObjectiveCounts.add(count); oStage.customObjectiveCounts.add(count);
oStage.customObjectiveData.add(data); oStage.customObjectiveData.add(data);
} }
} }
}
if (config.contains("quests." + questName + ".stages.ordered." + s2 + ".objective-override")) { if (config.contains("quests." + questName + ".stages.ordered." + s2 + ".objective-override")) {
oStage.objectiveOverride = config.getString("quests." + questName + ".stages.ordered." + s2 + ".objective-override"); oStage.objectiveOverride = config.getString("quests." + questName + ".stages.ordered." + s2 + ".objective-override");
} }
@ -3345,6 +3336,21 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
} }
} }
/**
* Add possibilty to use fallbacks for customs.
* Avoid null objects in datamap by initialize the entry value with empty string if no fallback present.
*/
static Map<String, Object> populateCustoms(ConfigurationSection sec2,Map<String, Object> datamap) {
Map<String,Object>data=new HashMap<String,Object>();
if(sec2!=null) {
for(String key:datamap.keySet()) {
data.put(key,sec2.contains(key)?sec2.get(key):datamap.get(key)!=null?datamap.get(key):new String());
}
}
return data;
}
private void stageFailed(String msg) throws StageFailedException { private void stageFailed(String msg) throws StageFailedException {
stageFailed(new String[] { msg }); stageFailed(new String[] { msg });
} }
@ -4121,4 +4127,5 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
e.printStackTrace(); e.printStackTrace();
} }
} }
} }