Merge tag '1.7.1' into develop

1.7.1

VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

acp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "",
   "main": "index.js",
   "scripts": {

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "",
   "main": "index.js",
   "scripts": {

ops/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-ops",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "",
   "main": "index.js",
   "scripts": {

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mnml"
-version = "1.7.0"
+version = "1.7.1"
 authors = ["ntr <ntr@smokestack.io>"]
 
 [dependencies]

server/src/skill.rs

@@ -1392,7 +1392,10 @@ fn sustain(source: &mut Construct, target: &mut Construct, mut results: Resoluti
             if red > 0 || blue > 0 { EventStages::PostOnly }
             else { EventStages::NoStages }
         }
-        _ => panic!("not recharge")
+        _ => {
+            warn!("no recharge event found {:?}", e);
+            return results;
+        }
     };
 
     results.push(Resolution::new(source, target).event(e).stages(stages));
@@ -1411,7 +1414,10 @@ fn intercept(source: &mut Construct, target: &mut Construct, mut results: Resolu
             if red > 0 || blue > 0 { EventStages::PostOnly }
             else { EventStages::NoStages }
         }
-        _ => panic!("not recharge")
+        _ => {
+            warn!("no recharge event found {:?}", e);
+            return results;
+        }
     };
     results.push(Resolution::new(source, target).event(e).stages(stages));
 
@@ -1713,7 +1719,10 @@ fn reflect(source: &mut Construct, target: &mut Construct, mut results: Resoluti
             if red > 0 || blue > 0 { EventStages::PostOnly }
             else { EventStages::NoStages }
         }
-        _ => panic!("not recharge")
+        _ => {
+            warn!("no recharge event found {:?}", e);
+            return results;
+        }
     };
     results.push(Resolution::new(source, target).event(e).stages(stages));
     return results;;
@@ -1728,7 +1737,10 @@ fn recharge(source: &mut Construct, target: &mut Construct, mut results: Resolut
             if red > 0 || blue > 0 { EventStages::AllStages }
             else { EventStages::StartEnd }
         }
-        _ => panic!("not recharge")
+        _ => {
+            warn!("no recharge event found {:?}", e);
+            return results;
+        }
     };
     results.push(Resolution::new(source, target).event(e).stages(stages));
     return results;