From 210029095af012580aedfc029b06f6e9a8d38cea Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Thu, 10 Feb 2022 14:50:33 +0100 Subject: [PATCH] fix(Core/GameObjects): Do not allow players to interact with gobs that use "Point" icon (#9800) - cherry-pick commit (https://github.com/TrinityCore/TrinityCore/commit/c52c0f0b7dbab9ff5f97426f1f742cb7cbe0732b) - This was confirmed in sniffs, see TrinityCore/TrinityCore@c52c0f0#commitcomment-34342342 Co-Authored-By: Wyrserth <43747507+Wyrserth@users.noreply.github.com> --- src/server/game/Entities/Player/Player.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 622d400d1..40ffbb88f 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2110,6 +2110,12 @@ GameObject* Player::GetGameObjectIfCanInteractWith(ObjectGuid guid, GameobjectTy { if (go->GetGoType() == type) { + // Players cannot interact with gameobjects that use the "Point" icon + if (go->GetGOInfo()->IconName == "Point") + { + return nullptr; + } + if (go->IsWithinDistInMap(this)) { return go;