2020-08-25 04:22:08 +02: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
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2020-10-14 16:00:43 +02:00
|
|
|
index da32f4affd381b08bd50e5882abffa58575737dd..7e91e95941039cce630ed3eb88e1919e1d08c091 100644
|
2020-08-25 04:22:08 +02:00
|
|
|
--- 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
|
|
|
|
|