Skip to content

Commit

Permalink
Fix not being able to remove allies
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexNijjar committed Apr 14, 2024
1 parent cdd430e commit ac21954
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 1 addition & 5 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
- Fixed allies not saving
- Fixed unhandled UUID parsing errors causing Cadmus compat to occasionally fail
- Fixed fake players not saving
- Made guild chat messages use chat formatting
- added `gc` shortcut command for guild chat
- Fixed not being able to remove allies
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ private static ArgumentBuilder<CommandSourceStack, LiteralArgumentBuilder<Comman
throw MemberException.NOT_AN_ALLY;
}

GuildApi.API.leave(guild.id(), target);
guild.members().remove(target.getUUID());
player.displayClientMessage(CommonUtils.serverTranslatable("text.argonauts.remove_ally", target.getName().getString()), false);
target.displayClientMessage(CommonUtils.serverTranslatable("text.argonauts.no_longer_allied", guild.displayName()), false);
});
return 1;
}));
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/resources/assets/argonauts/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
"text.argonauts.member.party_invite": "You've been invited to join %s's Party",
"text.argonauts.member.guild_invite": "You've been invited to join guild: %s",
"text.argonauts.member.guild_allied": "You are now allied with %s's Guild",
"text.argonauts.remove_ally": "%s is no longer allied to your guild",
"text.argonauts.no_longer_allied": "You are no longer allied to %s",
"text.argonauts.member.click_to_join": "§bClick here to join",
"text.argonauts.member.join": "Join \"%s\"",

Expand Down

0 comments on commit ac21954

Please sign in to comment.