Merge pull request #14 from 1101811b/pvp_system

Pvp system
Fixed some PvP bugs
Merge github.com:1101811b/DIM3-Team-Q-Fish into pvp_system