Skip to content

Commit

Permalink
G/P
Browse files Browse the repository at this point in the history
  • Loading branch information
Zarel committed May 15, 2021
1 parent 4288800 commit 5df0fab
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion server/chat-commands/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,7 @@ export const commands: Chat.ChatCommands = {
Ladders.challenges.add(
new Ladders.BattleInvite(user.id, targetUser.id, ready, {
acceptCommand: `/acceptbattle ${user.id}`,
message: `You've been invited to join a battle (with ${playerNames})`,
message: `You're invited to join a battle (with ${playerNames})`,
roomid: room.roomid,
})
);
Expand Down
4 changes: 2 additions & 2 deletions server/chat-plugins/rock-paper-scissors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,11 @@ export const commands: Chat.ChatCommands = {
if (targetUser === user) return this.errorReply(`You cannot challenge yourself.`);
if (targetUser.settings.blockChallenges && !user.can('bypassblocks', targetUser)) {
Chat.maybeNotifyBlocked('challenge', targetUser, user);
return this.errorReply(`This user is currently blocking challenges.`);
return this.errorReply(this.tr`The user '${targetUser.name}' is not accepting challenges right now.`);
}
const existingRoom = findExisting(user.id, targetUser.id);
if (existingRoom?.game && !existingRoom.game.ended) {
return this.errorReply(`You already have a Rock Paper Scissors game against ${targetUser.name}.`);
return this.errorReply(`You're already playing a Rock Paper Scissors game against ${targetUser.name}!`);
}

Ladders.challenges.add(
Expand Down

0 comments on commit 5df0fab

Please sign in to comment.