From 43da07fb55231eb520113a5745c36aab91e5d2bf Mon Sep 17 00:00:00 2001
From: hg <4683435+hgtw@users.noreply.github.com>
Date: Tue, 28 Jan 2020 19:04:47 -0500
Subject: [PATCH] Fix zone crash when a group member raid invites own group
 leader

---
 zone/client_packet.cpp | 5 +++++
 zone/string_ids.h      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index ebc6bd38a..dfb7ab673 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -11130,6 +11130,11 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 				break;
 			}
 
+			if (player_to_invite_group && player_to_invite_group->IsGroupMember(this)) {
+				MessageString(Chat::Red, ALREADY_IN_PARTY);
+				break;
+			}
+
 			if (player_to_invite_group && !player_to_invite_group->IsLeader(player_to_invite)) {
 				Message(Chat::Red, "You can only invite an ungrouped player or group leader to join your raid.");
 				break;
diff --git a/zone/string_ids.h b/zone/string_ids.h
index 0948d13a8..25321b3c9 100644
--- a/zone/string_ids.h
+++ b/zone/string_ids.h
@@ -417,6 +417,7 @@
 #define TARGET_PLAYER_FOR_GUILD_STATUS		12260
 #define GROUP_INVITEE_NOT_FOUND		12268	//You must target a player or use /invite <name> to invite someone to your group.
 #define GROUP_INVITEE_SELF			12270	//12270 You cannot invite yourself.
+#define ALREADY_IN_PARTY			12272	//That person is already in your party.
 #define NO_LONGER_HIDDEN			12337   //You are no longer hidden.
 #define STOP_SNEAKING				12338	//You stop sneaking
 #define NOT_IN_CONTROL				12368	//You do not have control of yourself right now.