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

[Client] Only add valid quests to journal

Browse source
This commit is contained in:
David Cernat 2017-08-31 09:08:29 +03:00
parent 134dd06d48
commit cf4021a7b5
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -666,17 +666,27 @@ void LocalPlayer::addJournalItems()
{ {
for (const auto &journalItem : journalChanges.journalItems) for (const auto &journalItem : journalChanges.journalItems)
{ {
MWWorld::Ptr ptrFound;
if (journalItem.type == JournalItem::ENTRY) if (journalItem.type == JournalItem::ENTRY)
{ {
MWWorld::Ptr ptrFound = MWBase::Environment::get().getWorld()->searchPtr(journalItem.actorRefId, false); ptrFound = MWBase::Environment::get().getWorld()->searchPtr(journalItem.actorRefId, false);
if (!ptrFound) if (!ptrFound)
ptrFound = getPlayerPtr(); ptrFound = getPlayerPtr();
MWBase::Environment::get().getJournal()->addEntry(journalItem.quest, journalItem.index, ptrFound);
} }
else
MWBase::Environment::get().getJournal()->setJournalIndex(journalItem.quest, journalItem.index); try
{
if (journalItem.type == JournalItem::ENTRY)
MWBase::Environment::get().getJournal()->addEntry(journalItem.quest, journalItem.index, ptrFound);
else
MWBase::Environment::get().getJournal()->setJournalIndex(journalItem.quest, journalItem.index);
}
catch (std::exception&)
{
LOG_APPEND(Log::LOG_INFO, "- Ignored addition of invalid journal quest %s", journalItem.quest.c_str());
}
} }
} }

2
apps/openmw/mwmp/processors/player/ProcessorPlayerJournal.hpp
View file

@ -15,6 +15,8 @@ namespace mwmp
virtual void Do(PlayerPacket &packet, BasePlayer *player) virtual void Do(PlayerPacket &packet, BasePlayer *player)
{ {
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_PLAYER_JOURNAL from server");
if (isRequest()) if (isRequest())
{ {
// Entire journal cannot currently be requested from players // Entire journal cannot currently be requested from players