Skip to content

Commit

Permalink
Merge branch 'main' of github.com:arcanistzed/scs
Browse files Browse the repository at this point in the history
  • Loading branch information
arcanistzed committed Sep 25, 2021
2 parents 9f404c2 + ed028fe commit 174ec65
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ export default class scsApp extends FormApplication {
};

/** Manage combat */
static combatManager() {
static async combatManager() {
// Start a combat as soon as a Combatant is created
Hooks.on("createCombatant", async () => {
if (game.combat) {
Expand Down

0 comments on commit 174ec65

Please sign in to comment.