don't allow inviting yourself to party

Hexaoxide · Sep 30, 2023 · 416be97 · 416be97
1 parent 24dcb81
commit 416be97
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/common/src/main/java/net/draycia/carbon/common/command/commands/PartyCommands.java b/common/src/main/java/net/draycia/carbon/common/command/commands/PartyCommands.java
@@ -163,6 +163,10 @@ private void createParty(final CommandContext<Commander> ctx) {
     private void invitePlayer(final CommandContext<Commander> ctx) {
         final CarbonPlayer player = ((PlayerCommander) ctx.getSender()).carbonPlayer();
         final CarbonPlayer recipient = ctx.get("player");
+        if (recipient.uuid().equals(player.uuid())) {
+            this.messages.cannotInviteSelf(player);
+            return;
+        }
         final @Nullable Party party = player.party().join();
         if (party == null) {
             this.messages.mustBeInParty(player);

diff --git a/common/src/main/java/net/draycia/carbon/common/messages/CarbonMessages.java b/common/src/main/java/net/draycia/carbon/common/messages/CarbonMessages.java
@@ -466,6 +466,9 @@ void errorCommandCommandExecution(
     @Message("command.party.must_be_in_party")
     void mustBeInParty(Audience audience);
 
+    @Message("command.party.cannot_invite_self")
+    void cannotInviteSelf(Audience audience);
+
     @Message("command.party.description")
     Component partyDesc();
 

diff --git a/common/src/main/resources/locale/messages-en_US.properties b/common/src/main/resources/locale/messages-en_US.properties
@@ -74,6 +74,7 @@ command.party.left_party=<green>Successfully left party '</green><party_name><gr
 command.party.disbanded=<green>Successfully disbanded party '</green><party_name><green>'.
 command.party.cannot_disband_multiple_members=<red>Cannot disband party '</red><party_name><red>', you are not the last member.
 command.party.must_be_in_party=<red>You must be in a party to use this command.
+command.party.cannot_invite_self=<red>You cannot invite yourself.
 command.party.description=Get info about your current party.
 command.party.create.description=Create a new party.
 command.party.invite.description=Invite a player to your party.