Browse Source

Fix for issue #427. Can no longer mentor self in a group.

devn00b 1 year ago
parent
commit
205db3bc8f
1 changed files with 5 additions and 3 deletions
  1. 5 3
      EQ2/source/WorldServer/Player.cpp

+ 5 - 3
EQ2/source/WorldServer/Player.cpp

@@ -6965,12 +6965,14 @@ void Player::MentorTarget()
 			}
 			if(client->GetPlayer()->group_id > 0 && client->GetPlayer()->GetTarget()->group_id == client->GetPlayer()->group_id)
 			{
-				if(client->GetPlayer()->GetGroupMemberInfo() && !client->GetPlayer()->GetGroupMemberInfo()->mentor_target_char_id && 
-				client->GetPlayer()->GetZone() == client->GetPlayer()->GetTarget()->GetZone())
+				if(client->GetPlayer()->GetGroupMemberInfo() && !client->GetPlayer()->GetGroupMemberInfo()->mentor_target_char_id && client->GetPlayer()->GetZone() == client->GetPlayer()->GetTarget()->GetZone() && client->GetPlayer()->GetTarget()->GetName() != client->GetPlayer()->GetName())
 				{
 					SetMentorStats(client->GetPlayer()->GetTarget()->GetLevel(), tmpPlayer->GetCharacterID());
 					client->Message(CHANNEL_COMMAND_TEXT, "You are now mentoring %s, reducing your effective level to %u.",client->GetPlayer()->GetTarget()->GetName(), client->GetPlayer()->GetTarget()->GetLevel());
 				}
+				if(client->GetPlayer()->GetTarget()->GetName() == client->GetPlayer()->GetName()) {
+					client->Message(CHANNEL_COMMAND_TEXT, "You cannot mentor yourself.");
+				}
 			}
 		}
 	}
@@ -7075,4 +7077,4 @@ void Player::ClearGMVisualFilters() {
 	vis_mutex.writelock(__FUNCTION__, __LINE__);
 	gm_visual_filters.clear();
 	vis_mutex.releasewritelock(__FUNCTION__, __LINE__);
-}
+}