Merge branch 'testing' of git.stellabellum.net:staff/src into testing

This commit is contained in:
DarthArgus
2017-01-01 02:14:52 -06:00
@@ -394,8 +394,6 @@ Snapshot * Persister::getSnapshotForObject(const NetworkId &networkId, uint32 se
{
Snapshot *snap = getSnapshotForServer(serverId);
pad.lock();
m_objectSnapshotMap[networkId]=snap;
return snap;
}