Merge branch 'heydabop/1339-attack-cancel-interaction' into 'master'

Fixes #1339 - Allow attacks and abilities to interrupt sprite interaction

Closes #1339

See merge request veloren/veloren!2864

common/src/states/sprite_interact.rs

@@ -112,6 +112,9 @@ impl CharacterBehavior for Data {
             },
         }
 
+        // Allow attacks and abilities to interrupt
+        handle_wield(data, &mut update);
+
         // At end of state logic so an interrupt isn't overwritten
         handle_state_interrupt(data, &mut update, false);