From 092825c42ca951b1ae8ca0112b9c69ad3fc23451 Mon Sep 17 00:00:00 2001 From: Mordred Date: Sun, 20 Jan 2019 00:20:35 +0100 Subject: [PATCH] Fixed mobs not being killable and spawning will use the correct state --- src/world/Actor/BNpc.cpp | 1 + src/world/Network/PacketWrappers/NpcSpawnPacket.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp index 17c4c02c..b8966bf4 100644 --- a/src/world/Actor/BNpc.cpp +++ b/src/world/Actor/BNpc.cpp @@ -61,6 +61,7 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX m_pos.z = posZ; m_rot = rot; m_level = level; + m_invincibilityType = InvincibilityNone; m_pCurrentZone = pZone; diff --git a/src/world/Network/PacketWrappers/NpcSpawnPacket.h b/src/world/Network/PacketWrappers/NpcSpawnPacket.h index dc4f9402..f487c50f 100644 --- a/src/world/Network/PacketWrappers/NpcSpawnPacket.h +++ b/src/world/Network/PacketWrappers/NpcSpawnPacket.h @@ -75,8 +75,6 @@ namespace Sapphire::Network::Packets::Server m_data.bNPCBase = bnpc.getBNpcBaseId(); m_data.bNPCName = bnpc.getBNpcNameId(); - m_data.state = 1; - assert( target.getId() != bnpc.getId() ); m_data.spawnIndex = target.getSpawnIdForActorId( bnpc.getId() );