2020-08-25 02:22:08 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: DigitalRegent <misterwener@gmail.com>
|
|
|
|
|
Date: Sat, 11 Apr 2020 13:10:58 +0200
|
|
|
|
|
Subject: [PATCH] Brand support
|
|
|
|
|
|
2021-02-21 19:45:33 +00:00
|
|
|
TODO(Proximyst): Fixup this into the other brand support patch
|
2020-08-25 02:22:08 +00:00
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2021-02-21 19:45:33 +00:00
|
|
|
index 3846e926e2442bc15dff41c70c5f2176f1c678be..7c8768765346b9349d0110ecf67be0bc8b00254a 100644
|
2020-08-25 02:22:08 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2021-02-21 19:45:33 +00:00
|
|
|
@@ -2397,7 +2397,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2020-08-25 02:22:08 +00:00
|
|
|
// Paper start - brand support
|
|
|
|
|
@Override
|
|
|
|
|
public String getClientBrandName() {
|
|
|
|
|
- return getHandle().playerConnection.getClientBrandName();
|
|
|
|
|
+ return getHandle().playerConnection != null ? getHandle().playerConnection.getClientBrandName() : null;
|
|
|
|
|
}
|
|
|
|
|
// Paper end
|
|
|
|
|
|
