Fix client brand NPE

This commit is contained in:
Axionize committed 2025-03-23 00:45:19 -04:00
1 parent ea0c2736e1
commit 921c009a59
2 files changed
+6 -1

No files matched your search

@@ -75,6 +75,7 @@ public class BukkitPlayer implements PlatformPlayer {
}
public BukkitPlayer(Player player) {
Preconditions.checkArgument(player != null);
this.bukkitPlayer = player;
this.user = PacketEvents.getAPI().getPlayerManager().getUser(bukkitPlayer);
Preconditions.checkArgument(user != null);
@@ -5,6 +5,8 @@ import com.github.retrooper.packetevents.event.PacketReceiveEvent;
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPluginMessage;
import me.caseload.knockbacksync.Base;
import me.caseload.knockbacksync.manager.PlayerDataManager;
import me.caseload.knockbacksync.player.PlayerData;
public class ClientBrandListener extends PacketListenerAbstract {
String brand = "vanilla";
@@ -16,7 +18,9 @@ public class ClientBrandListener extends PacketListenerAbstract {
WrapperPlayClientPluginMessage packet = new WrapperPlayClientPluginMessage(event);
String channelName = packet.getChannelName();
handle(channelName, packet.getData());
Base.INSTANCE.getPlatformServer().getPlayer(event.getUser().getUUID()).setClientBrand(brand);
PlayerData playerData = PlayerDataManager.getPlayerData(event.getUser());
if (playerData == null) return;
playerData.getPlatformPlayer().setClientBrand(brand);
}
}