mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
ada930bf8d
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: cfd18bd0 SPIGOT-6436: Add Player#stopAllSounds CraftBukkit Changes: b58f4299 SPIGOT-6436: Add Player#stopAllSounds eb191612 SPIGOT-6783: Items do not appear in custom anvil inventories 376edf4f SPIGOT-6779: Fix LivingEntity#attack for Player entities 747a73ec SPIGOT-6772: Use entity mailbox and re-schedule entities if they get unloaded
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: DigitalRegent <misterwener@gmail.com>
|
|
Date: Mon, 6 Apr 2020 20:30:09 +0200
|
|
Subject: [PATCH] Brand support
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index 3719cb69ea39414ac5eb0a877d3311c4d1d4b74e..1f1f87c0e40c05d95132685aebdb42633d170986 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -2245,6 +2245,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
// Paper end
|
|
}
|
|
|
|
+ // Paper start - brand support
|
|
+ /**
|
|
+ * Returns player's client brand name. If the client didn't send this information, the brand name will be null.<br>
|
|
+ * For the Notchian client this name defaults to <code>vanilla</code>. Some modified clients report other names such as <code>forge</code>.<br>
|
|
+ * @return client brand name
|
|
+ */
|
|
+ @Nullable
|
|
+ String getClientBrandName();
|
|
+ // Paper end
|
|
+
|
|
@NotNull
|
|
@Override
|
|
Spigot spigot();
|