From e9055b5e493101efafd7712d2d3ebbf50081fb59 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 30 May 2020 20:20:06 +0800 Subject: [PATCH] 1 --- server/gameserver/entity.h | 2 -- server/gameserver/human.cc | 2 +- server/gameserver/moveableentity.h | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/gameserver/entity.h b/server/gameserver/entity.h index 4b33ff5..efc8282 100644 --- a/server/gameserver/entity.h +++ b/server/gameserver/entity.h @@ -1,7 +1,5 @@ #pragma once -#include "gridservice.h" - namespace cs { class MFObjectPart; diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 227b002..2c37b14 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -2260,7 +2260,7 @@ void Human::ProcLootCar(Loot* entity, MetaData::Equip* item_meta) } if (car_.car_id != 0) { int entity_uniid = room->CreateLoot(car_.car_id, GetPos(), 1, 1); - Entity* loot_entity = room->GetEntityByUniId(GetEntityUniId()); + Entity* loot_entity = room->GetEntityByUniId(entity_uniid); if (loot_entity && loot_entity->IsEntityType(ET_Loot)) { ((Loot*)loot_entity)->bullet_num = 0; ((Loot*)loot_entity)->param1 = 0; diff --git a/server/gameserver/moveableentity.h b/server/gameserver/moveableentity.h index 4144ec4..653e8f9 100644 --- a/server/gameserver/moveableentity.h +++ b/server/gameserver/moveableentity.h @@ -1,5 +1,6 @@ #pragma once +#include "gridservice.h" #include "roomentity.h" class MoveableEntity : public RoomEntity