mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
69c7c31f9a
Upstream has released updates that appear to apply and compile correctly Paper Changes:26c37d99d5create random seeds for features using SecureRandom589bf2f1bfUpgrade gson to 2.8.8 (Closes #6370)0a6103597bGet entity default attributes (#6449)40057019e0Correctly inflate villager activation bounding box (#6798)e5f9241d15Left handed API (#6775)40ee63496cAdd advancement display API (#6175)9d570042edAdd ItemFactory#getMonsterEgg API (#6772)55ca459515rename method to getSpawnEggbb397ba74cAdd critical damage API (#6275)f47aeafe00Add Horse Animation API (#5599)7a0886180fAT & Mapping fixes (#6809)5553432644docs: Update gradle instructions for Java 16 (#6811) [ci skip]a1f49e4c60Fix command suggestion leak (#6592)9472d38f3cFix method name for Critical damage (#6813)
65 lines
2.6 KiB
Diff
65 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Thu, 15 Jul 2021 23:43:04 -0500
|
|
Subject: [PATCH] Clean up version command output for console
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
index 57a21495843f3a144cd73473cdc8781d6129b7ca..7d9ffef457da0571bb2254c35b908d9c22a3dd46 100644
|
|
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
@@ -168,14 +168,14 @@ public class VersionCommand extends BukkitCommand {
|
|
lastCheck = System.currentTimeMillis();
|
|
hasVersion = false;
|
|
} else {
|
|
- sender.sendMessage(versionMessage);
|
|
+ sendVersionMessage(sender); // Purpur
|
|
return;
|
|
}
|
|
}
|
|
versionLock.lock();
|
|
try {
|
|
if (hasVersion) {
|
|
- sender.sendMessage(versionMessage);
|
|
+ sendVersionMessage(sender); // Purpur
|
|
return;
|
|
}
|
|
versionWaiters.add(sender);
|
|
@@ -256,7 +256,7 @@ public class VersionCommand extends BukkitCommand {
|
|
hasVersion = true;
|
|
versionTaskStarted = false;
|
|
for (CommandSender sender : versionWaiters) {
|
|
- sender.sendMessage(versionMessage);
|
|
+ sendVersionMessage(sender); // Purpur
|
|
}
|
|
versionWaiters.clear();
|
|
} finally {
|
|
@@ -284,4 +284,27 @@ public class VersionCommand extends BukkitCommand {
|
|
return -1;
|
|
}
|
|
}
|
|
+
|
|
+ // Purpur start
|
|
+ private void sendVersionMessage(CommandSender sender) {
|
|
+ if (!(sender instanceof org.bukkit.command.ConsoleCommandSender)) {
|
|
+ sender.sendMessage(versionMessage);
|
|
+ return;
|
|
+ }
|
|
+ List<Component> list = new ArrayList<>();
|
|
+ if (versionMessage.children().size() == 1) {
|
|
+ versionMessage.children().get(0).children().forEach(child -> {
|
|
+ if (child.children().size() > 1) {
|
|
+ list.addAll(child.children());
|
|
+ } else {
|
|
+ list.add(child);
|
|
+ }
|
|
+ });
|
|
+ } else {
|
|
+ list.addAll(versionMessage.children());
|
|
+ }
|
|
+ list.removeIf(component -> net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer.plainText().serialize(component).equals("\n"));
|
|
+ list.forEach(sender::sendMessage);
|
|
+ }
|
|
+ // Purpur end
|
|
}
|