forked from MagicBane/Server
bugfix in parser
This commit is contained in:
@@ -159,7 +159,7 @@ public class PowersParser {
|
|||||||
case "ACTION":
|
case "ACTION":
|
||||||
actionEntry = new ActionEntry();
|
actionEntry = new ActionEntry();
|
||||||
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
|
||||||
actionEntry.effect_id = arguments.get(0);
|
actionEntry.action_id = arguments.get(0);
|
||||||
actionEntry.minTrains = Integer.parseInt(arguments.get(1));
|
actionEntry.minTrains = Integer.parseInt(arguments.get(1));
|
||||||
actionEntry.maxTrains = Integer.parseInt(arguments.get(2));
|
actionEntry.maxTrains = Integer.parseInt(arguments.get(2));
|
||||||
actionEntry.duration = Float.parseFloat(arguments.get(3));
|
actionEntry.duration = Float.parseFloat(arguments.get(3));
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import engine.mbEnums;
|
|||||||
|
|
||||||
public class ActionEntry {
|
public class ActionEntry {
|
||||||
|
|
||||||
public String effect_id;
|
public String action_id;
|
||||||
public int minTrains;
|
public int minTrains;
|
||||||
public int maxTrains;
|
public int maxTrains;
|
||||||
public float duration;
|
public float duration;
|
||||||
|
|||||||
@@ -337,10 +337,10 @@ public class WpakPowerManager {
|
|||||||
|
|
||||||
for (ActionEntry actionEntry : power.actionEntries) {
|
for (ActionEntry actionEntry : power.actionEntries) {
|
||||||
|
|
||||||
Effect effect = effect_data.get(actionEntry.effect_id);
|
Effect effect = effect_data.get(actionEntry.action_id);
|
||||||
|
|
||||||
if (effect == null) {
|
if (effect == null) {
|
||||||
Logger.error("Null effect for " + actionEntry.effect_id);
|
Logger.error("Null effect for " + actionEntry.action_id);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user