sanity checks

This commit is contained in:
AzaezelX 2022-04-05 20:17:51 -05:00
parent ed33c70a23
commit e1a127715e

View file

@ -438,16 +438,16 @@ void SpawnSphere::unpackUpdate(NetConnection * con, BitStream * stream)
stream->read(&mSpawnDataBlock); stream->read(&mSpawnDataBlock);
if (oldSDB != mSpawnDataBlock) if (oldSDB != mSpawnDataBlock)
{ {
delete mShapeInstance;
ShapeBaseData *spawnedDatablock = dynamic_cast<ShapeBaseData *>(Sim::findObject(mSpawnDataBlock.c_str())); ShapeBaseData *spawnedDatablock = dynamic_cast<ShapeBaseData *>(Sim::findObject(mSpawnDataBlock.c_str()));
if (spawnedDatablock) if (spawnedDatablock && spawnedDatablock->mShape)
{ {
delete mShapeInstance; mShapeInstance = new TSShapeInstance(spawnedDatablock->mShape);
mShapeInstance = new TSShapeInstance(spawnedDatablock->mShape);
} }
else else if (mDataBlock)
{ {
delete mShapeInstance; if (mDataBlock->mShape)
mShapeInstance = new TSShapeInstance(mDataBlock->mShape); mShapeInstance = new TSShapeInstance(mDataBlock->mShape);
} }
} }
stream->read(&mSpawnName); stream->read(&mSpawnName);