20 lines
945 B
Diff
20 lines
945 B
Diff
|
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
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
index c756b2f3faf253420b4d5737389acaa2f38b34ab..b97be51c6859fa2d45c07c853980adb05d11b65f 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
@@ -2146,7 +2146,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||
|
|
// Paper start - brand support
|
||
|
|
@Override
|
||
|
|
public String getClientBrandName() {
|
||
|
|
- return getHandle().playerConnection.getClientBrandName();
|
||
|
|
+ return getHandle().playerConnection != null ? getHandle().playerConnection.getClientBrandName() : null;
|
||
|
|
}
|
||
|
|
// Paper end
|
||
|
|
|