From 2f239fd6a36a45e3ba4bbcfe76ec1e6c571a5d6e Mon Sep 17 00:00:00 2001 From: Noudess Date: Thu, 25 Feb 2021 07:38:16 -0500 Subject: [PATCH 1/2] Don't take pet guard off when PC is summoned --- zone/zoning.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/zone/zoning.cpp b/zone/zoning.cpp index f44f508c2..bfdf25309 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -594,7 +594,6 @@ void Client::ProcessMovePC(uint32 zoneID, uint32 instance_id, float x, float y, //if they have a pet and they are staying in zone, move with them Mob *p = GetPet(); if(p != nullptr){ - p->SetPetOrder(SPO_Follow); p->GMMove(x+15, y, z); //so it dosent have to run across the map. } } From 1f3ce2b34db3b92d2c54f63da4968178d0a52eab Mon Sep 17 00:00:00 2001 From: Noudess Date: Thu, 25 Feb 2021 12:12:25 -0500 Subject: [PATCH 2/2] Remove pet move/follow on non-GM summon PCy --- zone/zoning.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zone/zoning.cpp b/zone/zoning.cpp index bfdf25309..675767754 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -590,10 +590,11 @@ void Client::ProcessMovePC(uint32 zoneID, uint32 instance_id, float x, float y, return; } - if(GetPetID() != 0) { + if(zm != SummonPC && GetPetID() != 0) { //if they have a pet and they are staying in zone, move with them Mob *p = GetPet(); if(p != nullptr){ + p->SetPetOrder(SPO_Follow); p->GMMove(x+15, y, z); //so it dosent have to run across the map. } }