Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

This commit is contained in:
ntr
2019-11-04 17:59:46 +11:00
5 changed files with 52 additions and 56 deletions
+4 -4
View File
@@ -1394,7 +1394,7 @@ fn sustain(source: &mut Construct, target: &mut Construct, mut results: Resoluti
}
_ => {
warn!("no recharge event found {:?}", e);
return results;
EventStages::NoStages
}
};
@@ -1416,7 +1416,7 @@ fn intercept(source: &mut Construct, target: &mut Construct, mut results: Resolu
}
_ => {
warn!("no recharge event found {:?}", e);
return results;
EventStages::NoStages
}
};
results.push(Resolution::new(source, target).event(e).stages(stages));
@@ -1721,7 +1721,7 @@ fn reflect(source: &mut Construct, target: &mut Construct, mut results: Resoluti
}
_ => {
warn!("no recharge event found {:?}", e);
return results;
EventStages::NoStages
}
};
results.push(Resolution::new(source, target).event(e).stages(stages));
@@ -1739,7 +1739,7 @@ fn recharge(source: &mut Construct, target: &mut Construct, mut results: Resolut
}
_ => {
warn!("no recharge event found {:?}", e);
return results;
EventStages::NoStages
}
};
results.push(Resolution::new(source, target).event(e).stages(stages));