ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ntr 2019-07-23 14:21:09 +10:00
commit 4c6ee01b5d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/events.jsx
View File

@ -78,9 +78,10 @@ function registerEvents(store) {
store.dispatch(actions.setAnimSource(null)); store.dispatch(actions.setAnimSource(null));
store.dispatch(actions.setAnimTarget(null)); store.dispatch(actions.setAnimTarget(null));
store.dispatch(actions.setAnimText(null)); store.dispatch(actions.setAnimText(null));
store.dispatch(actions.setAnimFocus([]));
// We currently need another small timeout so that everything can properly dismount / unload // We currently need another small timeout so that everything can properly dismount / unload
// Otherwise 3 x Attack on same target will only render the first time // Otherwise 3 x Attack on same target will only render the first time
return setTimeout(cb, 75); return setTimeout(cb, 200);
}, timeout); }, timeout);
}, err => { }, err => {
if (err) return console.error(err); if (err) return console.error(err);

6
server/src/player.rs
View File

@ -145,9 +145,9 @@ impl Player {
if free_colours < 2 { if free_colours < 2 {
break; break;
} }
self.bot_vbox_accept(0).expect("could't accept colour 0"); self.bot_vbox_accept(0).expect("could't accept colour item");
self.bot_vbox_accept(0).expect("could't accept colour 1"); self.bot_vbox_accept(0).expect("could't accept colour item");
self.bot_vbox_accept(group_i).expect("could't accept group 0"); self.bot_vbox_accept(group_i).expect("could't accept group item");
} }
// info!("{:?}", self.vbox.bound); // info!("{:?}", self.vbox.bound);