fix 1214 bug
Merge branch 'master' of github.com:MacDino/fightgame