mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-06-23 16:41:40 +00:00
[Client] Disable clientside handling of summoned creature graveyards
This commit is contained in:
parent
138aef37fe
commit
d9502d84a9
2 changed files with 22 additions and 0 deletions
|
@ -2109,6 +2109,13 @@ namespace MWMechanics
|
||||||
cleanupSummonedCreature(stats, creature.second);
|
cleanupSummonedCreature(stats, creature.second);
|
||||||
creatureMap.clear();
|
creatureMap.clear();
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
Start of tes3mp change (major)
|
||||||
|
|
||||||
|
Don't use a clientside creature graveyard in multiplayer and expect the server
|
||||||
|
to handle summon deletions instead
|
||||||
|
*/
|
||||||
|
/*
|
||||||
else if (creatureActorId != -1)
|
else if (creatureActorId != -1)
|
||||||
{
|
{
|
||||||
// We didn't find the creature. It's probably in an inactive cell.
|
// We didn't find the creature. It's probably in an inactive cell.
|
||||||
|
@ -2116,6 +2123,10 @@ namespace MWMechanics
|
||||||
std::vector<int>& graveyard = casterStats.getSummonedCreatureGraveyard();
|
std::vector<int>& graveyard = casterStats.getSummonedCreatureGraveyard();
|
||||||
graveyard.push_back(creatureActorId);
|
graveyard.push_back(creatureActorId);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
End of tes3mp change (major)
|
||||||
|
*/
|
||||||
|
|
||||||
purgeSpellEffects(creatureActorId);
|
purgeSpellEffects(creatureActorId);
|
||||||
}
|
}
|
||||||
|
|
|
@ -148,11 +148,22 @@ namespace MWMechanics
|
||||||
++it;
|
++it;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Start of tes3mp change (major)
|
||||||
|
|
||||||
|
Don't use a clientside creature graveyard in multiplayer and expect the server
|
||||||
|
to handle summon deletions instead
|
||||||
|
*/
|
||||||
|
/*
|
||||||
std::vector<int> graveyard = creatureStats.getSummonedCreatureGraveyard();
|
std::vector<int> graveyard = creatureStats.getSummonedCreatureGraveyard();
|
||||||
creatureStats.getSummonedCreatureGraveyard().clear();
|
creatureStats.getSummonedCreatureGraveyard().clear();
|
||||||
|
|
||||||
for (const int creature : graveyard)
|
for (const int creature : graveyard)
|
||||||
MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(mActor, creature);
|
MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(mActor, creature);
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
End of tes3mp change (major)
|
||||||
|
*/
|
||||||
|
|
||||||
if (!cleanup)
|
if (!cleanup)
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in a new issue