krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Client] Prevent errors from NPC-only packets for DedicatedPlayers

Browse source
This commit is contained in:
David Cernat 2018-04-13 16:23:42 +03:00
parent 68ee64902d
commit 716809f2db
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwmp/DedicatedPlayer.cpp
View file

@ -276,6 +276,9 @@ void DedicatedPlayer::setAnimFlags()
void DedicatedPlayer::setEquipment() void DedicatedPlayer::setEquipment()
{ {
// Go no further if the player is disguised as a creature
if (!ptr.getClass().hasInventoryStore(ptr)) return;
MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr); MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot) for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
{ {

4
apps/openmw/mwmp/processors/player/ProcessorPlayerSkill.hpp
View file

@ -30,6 +30,10 @@ namespace mwmp
else if (player != 0) else if (player != 0)
{ {
MWWorld::Ptr ptrPlayer = static_cast<DedicatedPlayer *>(player)->getPtr(); MWWorld::Ptr ptrPlayer = static_cast<DedicatedPlayer *>(player)->getPtr();
// Go no further if the player is disguised as a creature
if (ptrPlayer.getTypeName() != typeid(ESM::NPC).name()) return;
MWMechanics::NpcStats *ptrNpcStats = &ptrPlayer.getClass().getNpcStats(ptrPlayer); MWMechanics::NpcStats *ptrNpcStats = &ptrPlayer.getClass().getNpcStats(ptrPlayer);
MWMechanics::SkillValue skillValue; MWMechanics::SkillValue skillValue;