Default in map.cpp didn't match default in conf, so people who didn't update their conf were getting uncapped CoP battles. That's retail, but not currently desired behavior.
Merge pull request #127 from TeoTwawki/misc

Default in map.cpp didn't match default in conf, so people who didn't update their conf were getting uncapped CoP battles.