From 6f4439ee2182dd3421ff50c7b479c1b9e7f02fcb Mon Sep 17 00:00:00 2001
From: Kenpachi Developer <Kenpachi.Developer@gmx.de>
Date: Mon, 22 Jun 2020 05:16:46 +0200
Subject: Remove/move unnecessarily calling clif_send_petstatus()

---
 src/map/atcommand.c | 8 ++------
 src/map/pet.c       | 1 -
 src/map/script.c    | 3 ++-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 3b4334275..9d5c601bf 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2810,10 +2810,8 @@ ACMD(petfriendly)
 		return false;
 	}
 
-	if (friendly != pd->pet.intimate) { // No need to update the pet's status if intimacy value won't change.
+	if (friendly != pd->pet.intimate) // No need to update the pet's status if intimacy value won't change.
 		pet->set_intimate(pd, friendly);
-		clif->send_petstatus(sd);
-	}
 
 	clif->message(fd, msg_fd(fd, 182)); // Pet intimacy changed. (Send message regardless of value has changed or not.)
 
@@ -2854,10 +2852,8 @@ ACMD(pethungry)
 		return false;
 	}
 
-	if (hungry != pd->pet.hungry) { // No need to update the pet's status if hunger value won't change.
+	if (hungry != pd->pet.hungry) // No need to update the pet's status if hunger value won't change.
 		pet->set_hunger(pd, hungry);
-		clif->send_petstatus(sd);
-	}
 
 	clif->message(fd, msg_fd(fd, 185)); // Pet hunger changed. (Send message regardless of value has changed or not.)
 
diff --git a/src/map/pet.c b/src/map/pet.c
index 9c7a1aab4..da93906ae 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -884,7 +884,6 @@ static int pet_change_name_ack(struct map_session_data *sd, const char *name, in
 	aFree(newname);
 	clif->blname_ack(0,&pd->bl);
 	pd->pet.rename_flag = 1;
-	clif->send_petstatus(sd);
 	return 1;
 }
 
diff --git a/src/map/script.c b/src/map/script.c
index d501818d9..3da0cdceb 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -20518,6 +20518,8 @@ static BUILDIN(setunitdata)
 			break;
 		case UDT_LEVEL:
 			pd->pet.level = (short)val;
+			if (pd->msd != NULL)
+				clif->send_petstatus(pd->msd); // Send pet data.
 			break;
 		case UDT_HP:
 			status->set_hp(bl, (unsigned int)val, STATUS_HEAL_DEFAULT);
@@ -20639,7 +20641,6 @@ static BUILDIN(setunitdata)
 			return false;
 		}
 
-		clif->send_petstatus(pd->msd); // Send pet data.
 		break;
 	}
 	case BL_MER: {
-- 
cgit v1.2.3-60-g2f50