diff --git a/patches/server/0204-Add-credits-command.patch b/patches/server/0203-Add-credits-command.patch similarity index 85% rename from patches/server/0204-Add-credits-command.patch rename to patches/server/0203-Add-credits-command.patch index b3e3ce835..d42cfee19 100644 --- a/patches/server/0204-Add-credits-command.patch +++ b/patches/server/0203-Add-credits-command.patch @@ -30,7 +30,7 @@ index 0161657748d398b6827ef8bc2b00b8a63bf37c55..aaff933c5bf619303842ce6b9a9dc979 public static final PacketPlayOutGameStateChange.a g = new PacketPlayOutGameStateChange.a(6); public static final PacketPlayOutGameStateChange.a h = new PacketPlayOutGameStateChange.a(7); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c0ef121956ad42bbb555eb8ee6c46b1845dd9e0d..00733da228556230c7886939350007bd68b8639c 100644 +index c0ef121956ad42bbb555eb8ee6c46b1845dd9e0d..e0228fb58149ac8a9430d54157d5e92c93618f22 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -161,6 +161,7 @@ public class PurpurConfig { @@ -41,12 +41,20 @@ index c0ef121956ad42bbb555eb8ee6c46b1845dd9e0d..00733da228556230c7886939350007bd public static String pingCommandOutput = "§a%s's ping is %sms"; public static String cannotRideMob = "§cYou cannot mount that mob"; private static void messages() { +@@ -169,6 +170,7 @@ public class PurpurConfig { + afkTabListPrefix = getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix); + afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix); + demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput); ++ creditsCommandOutput = getString("settings.messages.credits-command-output", creditsCommandOutput); + pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput); + cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob); + } diff --git a/src/main/java/net/pl3x/purpur/command/CreditsCommand.java b/src/main/java/net/pl3x/purpur/command/CreditsCommand.java new file mode 100644 -index 0000000000000000000000000000000000000000..533f067a5c8aaa4a1f83682ea24ffad2372afa78 +index 0000000000000000000000000000000000000000..ccb7b9de16c75cd2cddd0c4bbf8e4595e3c61dea --- /dev/null +++ b/src/main/java/net/pl3x/purpur/command/CreditsCommand.java -@@ -0,0 +1,40 @@ +@@ -0,0 +1,41 @@ +package net.pl3x.purpur.command; + +import net.minecraft.commands.CommandDispatcher; @@ -80,6 +88,7 @@ index 0000000000000000000000000000000000000000..533f067a5c8aaa4a1f83682ea24ffad2 + private static int execute(CommandListenerWrapper sender, Collection targets) { + for (EntityPlayer player : targets) { + PacketPlayOutGameStateChange packet = new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.credits(), 1F); ++ player.viewingCredits = true; + player.playerConnection.sendPacket(packet); + String output = String.format(PurpurConfig.creditsCommandOutput, player.getProfile().getName()); + sender.sendMessage(CraftChatMessage.fromStringOrNull(output), false);