AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-28 07:32:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Client] Ignore ObjectSpawn packets trying to spawn non-actors

Browse Source
This commit is contained in:
David Cernat 2018-07-26 22:41:04 +03:00
parent d93b67ef21
commit c7bcf70c32
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/openmw/mwmp/ObjectList.cpp
View File

@ -402,9 +402,10 @@ void ObjectList::spawnObjects(MWWorld::CellStore* cellStore)
MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), baseObject.refId, 1); MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), baseObject.refId, 1);
MWWorld::Ptr newPtr = ref.getPtr(); MWWorld::Ptr newPtr = ref.getPtr();
newPtr.getCellRef().setMpNum(baseObject.mpNum); if (newPtr.getClass().isActor())
{
newPtr = MWBase::Environment::get().getWorld()->placeObject(newPtr, cellStore, baseObject.position); newPtr = MWBase::Environment::get().getWorld()->placeObject(newPtr, cellStore, baseObject.position);
MWMechanics::CreatureStats& creatureStats = newPtr.getClass().getCreatureStats(newPtr);
if (baseObject.isSummon) if (baseObject.isSummon)
{ {
@ -420,7 +421,7 @@ void ObjectList::spawnObjects(MWWorld::CellStore* cellStore)
LOG_APPEND(Log::LOG_VERBOSE, "-- Actor has master: %s", masterPtr.getCellRef().getRefId().c_str()); LOG_APPEND(Log::LOG_VERBOSE, "-- Actor has master: %s", masterPtr.getCellRef().getRefId().c_str());
MWMechanics::AiFollow package(masterPtr); MWMechanics::AiFollow package(masterPtr);
newPtr.getClass().getCreatureStats(newPtr).getAiSequence().stack(package, newPtr); creatureStats.getAiSequence().stack(package, newPtr);
MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(newPtr); MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(newPtr);
if (anim) if (anim)
@ -438,6 +439,9 @@ void ObjectList::spawnObjects(MWWorld::CellStore* cellStore)
} }
} }
} }
else
LOG_APPEND(Log::LOG_VERBOSE, "-- Cannot spawn non-actor object!");
}
else else
LOG_APPEND(Log::LOG_VERBOSE, "-- Actor already existed!"); LOG_APPEND(Log::LOG_VERBOSE, "-- Actor already existed!");
} }