mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-21 16:09:19 +00:00
778edd2e05
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1c3c47a Correctly check enchants for ItemStack#damage (#11240) PaperMC/Paper@1187544 Fix teleport event getTo returning null (#11239) PaperMC/Paper@dd941cc Re-add patches for can-place/can-destroy API (#11238) PaperMC/Paper@ab0d24a Configuration for horizontal-only item merging (#11219) PaperMC/Paper@098bd39 Remove arbitrary book page limit (#11228) PaperMC/Paper@f97aff7 [ci skip] Fix Effect javadocs (#11182) PaperMC/Paper@4a97ba3 Fix `setSendViewDistance`'s return (#11247) PaperMC/Paper@1798e94 Fix BasicCommand suggestion arg count (#11241) PaperMC/Paper@7c9240f Improve standard messenger logging PaperMC/Paper@9ab644e Fix `TooltipContext.create` being wrong(#11254) PaperMC/Paper@11b4ac7 Fix disableEndCredits world config (#11261) PaperMC/Paper@bf5852a Fix NPE for PlayerPostRespawnEvent#getRespawnedLocation (#11268) PaperMC/Paper@fb53074 Apply optimise collision checking in move packet handling patch PaperMC/Paper@81bfda8 [ci skip] Specify rebase location in CONTRIBUTING (#11255) PaperMC/Paper@9571983 Fix scanForLegacyEnderDragon world config (#11262) PaperMC/Paper@ec55c11 Fix indestructable light blocks (#11275) PaperMC/Paper@1b8ab11 Add Configuration for vertical Despawn Ranges (#10440) PaperMC/Paper@534ab86 [ci-skip] Revert "Add Configuration for vertical Despawn Ranges (#10440)" (#11278) PaperMC/Paper@e619744 Allow skipping of world symlink validation (#11250) PaperMC/Paper@78216fe Re-implement portalCreateRadius world config (#11267) PaperMC/Paper@4829fbf Handle custom registry elements properly (#11230) PaperMC/Paper@d5ffc57 Implement more methods for horse inventories (#11147) PaperMC/Paper@52ae4ad Migrate ArmorStand meta to using entity tag (#11107) PaperMC/Paper@75655ec Add Configuration for vertical Despawn Ranges (#11279) PaperMC/Paper@0e73617 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11284) PaperMC/Paper@66a97cc Update item data sanitization (#11227) PaperMC/Paper@2e82fd2 Add even more Enchantment API (#11115) PaperMC/Paper@57dd822 Leashable API (#10961) PaperMC/Paper@8c3018a Fix Selector Arguments not working with permission (#11286) PaperMC/Paper@4401748 Fix CraftBukkit drag system (#10703) PaperMC/Paper@64c9ee6 Allow getting/setting the sign's editor uuid (#10637) Gale Changes: Dreeam-qwq/Gale@dc228bb Updated Upstream (Paper) Dreeam-qwq/Gale@ecbaa9c Updated Upstream (Paper) Dreeam-qwq/Gale@7e2df5b Updated Upstream (Paper) Dreeam-qwq/Gale@ea59414 Updated Upstream (Paper) Dreeam-qwq/Gale@e373e97 Updated Upstream (Paper) Purpur Changes: PurpurMC/Purpur@366af80 Updated Upstream (Paper) PurpurMC/Purpur@07979c3 Updated Upstream (Paper) PurpurMC/Purpur@3f790ac Updated Upstream (Paper) PurpurMC/Purpur@201e928 Updated Upstream (Pufferfish) (#1575) PurpurMC/Purpur@f2307b8 Updated Upstream (Paper) PurpurMC/Purpur@bba87bf Updated Upstream (Paper) PurpurMC/Purpur@f530395 Fix no exp drops from spawners using silk touch pickaxe without option enabled (#1582)
42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
|
Date: Tue, 21 May 2024 11:43:49 +0800
|
|
Subject: [PATCH] Rebrand
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
|
index bdc8d830f54e4567ec0b03041221fdcd016ce76c..25ad7e9a9aa11049ad6ce2d2c829d3e75f8886c2 100644
|
|
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
|
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
|
@@ -25,6 +25,17 @@ public interface ServerBuildInfo {
|
|
Key BRAND_GALE_ID = Key.key("galemc", "gale");
|
|
// Gale end - branding changes
|
|
|
|
+ // Leaf start
|
|
+ /**
|
|
+ * The brand id for Pufferfish.
|
|
+ */
|
|
+ Key BRAND_PUFFERFISH_ID = Key.key("pufferfish-gg", "pufferfish");
|
|
+ /**
|
|
+ * The brand id for Leaf.
|
|
+ */
|
|
+ Key BRAND_LEAF_ID = Key.key("winds-studio", "leaf");
|
|
+ // Leaf end
|
|
+
|
|
/**
|
|
* Gets the {@code ServerBuildInfo}.
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
index e64bb57f74e6d6f78927be228825b3e0bdf41f48..5bccca7740dbec750960d96d4d951cff5da688da 100644
|
|
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
@@ -215,7 +215,7 @@ public class VersionCommand extends BukkitCommand {
|
|
String version = Bukkit.getVersion();
|
|
// Paper start
|
|
if (version.startsWith("null")) { // running from ide?
|
|
- setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW));
|
|
+ setVersionMessage(Component.text("* Unknown version, custom build?", NamedTextColor.RED)); // Leaf - Purpur - Clean up version command output
|
|
return;
|
|
}
|
|
setVersionMessage(getVersionFetcher().getVersionMessage(version));
|