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 d40ff328c4c29038c43a5e66f788a11515abb8e2..eb928f66d9ba8f4bd58bc683353f675b3774eb0f 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2183,7 +2183,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
|
|
|