Skip to content

Commit

Permalink
Merge pull request #1479 from 1lent/2.0
Browse files Browse the repository at this point in the history
Grammar fixes
  • Loading branch information
AoElite authored May 23, 2024
2 parents d13d872 + 6059553 commit 45f93b7
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/main/java/ac/grim/grimac/commands/GrimLog.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void onLog(CommandSender sender, int flagId) {
} else {
String uploading = GrimAPI.INSTANCE.getConfigManager().getConfig().getStringElse("upload-log-start", "%prefix% &fUploading log... please wait");
String success = GrimAPI.INSTANCE.getConfigManager().getConfig().getStringElse("upload-log", "%prefix% &fUploaded debug to: %url%");
String failure = GrimAPI.INSTANCE.getConfigManager().getConfig().getStringElse("upload-log-upload-failure", "%prefix% &cSomething went wrong while uploading this log, see console for more info");
String failure = GrimAPI.INSTANCE.getConfigManager().getConfig().getStringElse("upload-log-upload-failure", "%prefix% &cSomething went wrong while uploading this log, see console for more information.");

sender.sendMessage(MessageUtil.format(uploading));

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ac/grim/grimac/commands/GrimProfile.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void onConsoleDebug(CommandSender sender, OnlinePlayer target) {

// Short circuit due to minimum java requirements for MultiLib
if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_18) && MultiLibUtil.isExternalPlayer(target.getPlayer())) {
String alertString = GrimAPI.INSTANCE.getConfigManager().getConfig().getStringElse("player-not-this-server", "%prefix% &cPlayer isn't on this server!");
String alertString = GrimAPI.INSTANCE.getConfigManager().getConfig().getStringElse("player-not-this-server", "%prefix% &cThis player isn't on this server!");
sender.sendMessage(MessageUtil.format(alertString));
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ac/grim/grimac/commands/GrimSpectate.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void onSpectate(CommandSender sender, @Optional OnlinePlayer target) {
}

if (target == null || (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_18) && MultiLibUtil.isExternalPlayer(target.getPlayer()))) {
String message = GrimAPI.INSTANCE.getConfigManager().getConfig().getStringElse("player-not-this-server", "%prefix% &cPlayer isn't on this server!");
String message = GrimAPI.INSTANCE.getConfigManager().getConfig().getStringElse("player-not-this-server", "%prefix% &cThis player isn't on this server!");
sender.sendMessage(MessageUtil.format(message));
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public void onStopSpectate(CommandSender sender, String[] args) {
boolean teleportBack = string == null || !string.equalsIgnoreCase("here");
GrimAPI.INSTANCE.getSpectateManager().disable(player, teleportBack);
} else {
String message = GrimAPI.INSTANCE.getConfigManager().getConfig().getStringElse("cannot-spectate-return", "%prefix% &cYou can only do this after spectating a player");
String message = GrimAPI.INSTANCE.getConfigManager().getConfig().getStringElse("cannot-spectate-return", "%prefix% &cYou can only do this after spectating a player.");
sender.sendMessage(MessageUtil.format(message));
}
}
Expand Down

0 comments on commit 45f93b7

Please sign in to comment.