Revert "Revert "Fix some bugs""

This reverts commit 9fd626468e.
This commit is contained in:
Lost-MSth
2021-04-05 13:20:36 +08:00
parent 9fd626468e
commit d577246d28
4 changed files with 954 additions and 906 deletions