Server: Refactoring Trap Protocol / Data
Generator throws different traps to both Players
Merge remote-tracking branch 'origin/master'