mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
d5d756bc32
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@c1b4899 Fix dupe uuid check on entity add (#6735) PaperMC/Paper@3f043f7 Async catch modifications to critical entity state PaperMC/Paper@bc43f40 Update jline and TCA (#6829) PaperMC/Paper@d9e2817 Update paperweight to 1.1.13 (#6866) PaperMC/Paper@3e310e0 Remove redundant and unneeded repos, reorder repos (#6867) PaperMC/Paper@485d15f Update paperweight to 1.1.14 (#6868) PaperMC/Paper@09d50a9 Added missing mappings (#6810) PaperMC/Paper@0968cdd Move async catches back to where they were (#6869) PaperMC/Paper@6f71b7c Deduplicate strings in ObfHelper (#6841) PaperMC/Paper@ada930b Updated Upstream (Bukkit/CraftBukkit) (#6872) PaperMC/Paper@06d82e0 Cache palette array (#6767) PaperMC/Paper@70fe58d Expose the potential player cause of a lightning (#6782) PaperMC/Paper@c20c9d3 Fix CraftNamespacedKey shenanigans (#6825) PaperMC/Paper@29bb5a9 Add PlayerDeathEvent#getPlayer for clarity (#6859) PaperMC/Paper@124d079 Fix issues with mob conversion (#6831) PaperMC/Paper@22b0238 Add API for checking if a zombie has the option to break doors (#6855) PaperMC/Paper@5af80b0 Add isCollidable methods to various places (#6870) PaperMC/Paper@32ba088 Fix setPatternColor on tropical fish bucket meta (#6877) PaperMC/Paper@87121ce Move `getTrackedPlayers` up from Player to Entity (#6569) PaperMC/Paper@a923e33 Make despawn distance configs per-category, improve per category spawn limit config (#6717) PaperMC/Paper@3f17694 Goat ram API (#6336) PaperMC/Paper@cc2ecbc Add Raw Byte Entity Serialization (#6826) Airplane Changes: TECHNOVE/Airplane@e47949b Ty Penple <3 TECHNOVE/Airplane@86fee6b Update upstream
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
|
|
}
|