diff --git a/apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp index 94e29a728..bbfb0c731 100644 --- a/apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerDeath.hpp @@ -22,6 +22,8 @@ namespace mwmp { LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player.npc.mName.c_str()); + player.creatureStats.mDead = true; + packet.Send(true); Script::Call(player.getId()); diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerDeath.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerDeath.hpp index 797dd3ec7..c6958eca3 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerDeath.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerDeath.hpp @@ -26,6 +26,8 @@ namespace mwmp { LOG_APPEND(Log::LOG_INFO, "- Packet was about me"); + player->creatureStats.mDead = true; + MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr(); MWMechanics::DynamicStat health = playerPtr.getClass().getCreatureStats(playerPtr).getHealth(); health.setCurrent(0); diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerResurrect.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerResurrect.hpp index 3ee11262e..e79df2ce1 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerResurrect.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerResurrect.hpp @@ -27,6 +27,8 @@ namespace mwmp if (isLocal()) { LOG_APPEND(Log::LOG_INFO, "- Packet was about me with resurrectType of %i", player->resurrectType); + + player->creatureStats.mDead = false; MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr(); diff --git a/components/openmw-mp/Packets/Player/PacketPlayerDeath.hpp b/components/openmw-mp/Packets/Player/PacketPlayerDeath.hpp index d65099114..d558a5cfc 100644 --- a/components/openmw-mp/Packets/Player/PacketPlayerDeath.hpp +++ b/components/openmw-mp/Packets/Player/PacketPlayerDeath.hpp @@ -21,7 +21,6 @@ namespace mwmp void Packet(RakNet::BitStream *bs, bool send) { PlayerPacket::Packet(bs, send); - RW(player->creatureStats.mDead, send); RW(player->deathReason, send, 1); } diff --git a/components/openmw-mp/Packets/Player/PacketPlayerResurrect.cpp b/components/openmw-mp/Packets/Player/PacketPlayerResurrect.cpp index db01227b4..9a35e3784 100644 --- a/components/openmw-mp/Packets/Player/PacketPlayerResurrect.cpp +++ b/components/openmw-mp/Packets/Player/PacketPlayerResurrect.cpp @@ -13,6 +13,5 @@ void PacketPlayerResurrect::Packet(RakNet::BitStream *bs, bool send) { PlayerPacket::Packet(bs, send); - RW(player->creatureStats.mDead, send); RW(player->resurrectType, send); }