From 445d9e51e2dbac44512274939ee2b7daf2ce5d5d Mon Sep 17 00:00:00 2001 From: John <63141077+AconiteX@users.noreply.github.com> Date: Mon, 21 Mar 2022 20:33:07 -0400 Subject: [PATCH] Update ServerObject.cpp --- .../library/serverGame/src/shared/object/ServerObject.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp index 07bbaa8e..28d56891 100755 --- a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp @@ -1425,16 +1425,16 @@ bool ServerObject::canTrade() const auto tpf = dynamic_cast(getObjectTemplate()); if(tpf) { - const int flags = tpf->getMoveFlagsCount(); + const size_t flags = tpf->getMoveFlagsCount(); if(flags > 0) { - for (size_t i = 0; i < tpf->getMoveFlagsCount(); i++) + for (size_t i = 0; i < flags; i++) { - if(tpf->getMoveFlags(i) == ServerObjectTemplate::MF_gm) + if(!hasGmFlag && tpf->getMoveFlags(i) == ServerObjectTemplate::MF_gm) { hasGmFlag = true; } - if (tpf->getMoveFlags(i) == ServerObjectTemplate::MF_player) + if (!hasPlayerFlag && tpf->getMoveFlags(i) == ServerObjectTemplate::MF_player) { hasPlayerFlag = true; }