Skip to content

Commit 921c009

Browse files
committed
Fix client brand NPE
1 parent ea0c273 commit 921c009

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

bukkit/src/main/java/me/caseload/knockbacksync/player/BukkitPlayer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public class BukkitPlayer implements PlatformPlayer {
7575
}
7676

7777
public BukkitPlayer(Player player) {
78+
Preconditions.checkArgument(player != null);
7879
this.bukkitPlayer = player;
7980
this.user = PacketEvents.getAPI().getPlayerManager().getUser(bukkitPlayer);
8081
Preconditions.checkArgument(user != null);

common/src/main/java/me/caseload/knockbacksync/listener/packetevents/ClientBrandListener.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
66
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPluginMessage;
77
import me.caseload.knockbacksync.Base;
8+
import me.caseload.knockbacksync.manager.PlayerDataManager;
9+
import me.caseload.knockbacksync.player.PlayerData;
810

911
public class ClientBrandListener extends PacketListenerAbstract {
1012
String brand = "vanilla";
@@ -16,7 +18,9 @@ public void onPacketReceive(final PacketReceiveEvent event) {
1618
WrapperPlayClientPluginMessage packet = new WrapperPlayClientPluginMessage(event);
1719
String channelName = packet.getChannelName();
1820
handle(channelName, packet.getData());
19-
Base.INSTANCE.getPlatformServer().getPlayer(event.getUser().getUUID()).setClientBrand(brand);
21+
PlayerData playerData = PlayerDataManager.getPlayerData(event.getUser());
22+
if (playerData == null) return;
23+
playerData.getPlatformPlayer().setClientBrand(brand);
2024
}
2125
}
2226

0 commit comments

Comments
 (0)