Fix NPE on startup when players join due to event UUID being null; introduced by new folia support

This commit is contained in:
Axionize committed 2024-12-17 00:30:22 -05:00
1 parent 8e52dae5b2
commit f665d1e13e
2 files changed
+8 -2

No files matched your search

@@ -13,6 +13,7 @@ import me.caseload.knockbacksync.player.PlayerData;
import me.caseload.knockbacksync.util.data.Pair;
import java.util.Queue;
import java.util.UUID;
public class PingReceiveListener extends PacketListenerAbstract {
@@ -26,7 +27,9 @@ public class PingReceiveListener extends PacketListenerAbstract {
// And then receive a response we have to ensure that if the packet was sent by us we cancel it
// otherwise the server will likely kick the player
PacketTypeCommon packetType = event.getPacketType();
PlayerData playerData = PlayerDataManager.getPlayerData(event.getUser().getUUID());
UUID playerUUID = event.getUser().getUUID();
if (playerUUID == null) return;
PlayerData playerData = PlayerDataManager.getPlayerData(playerUUID);
if (playerData == null) return;
if (playerData.pingStrategy == PingStrategy.KEEPALIVE && packetType == PacketType.Play.Client.KEEP_ALIVE) {
@@ -16,6 +16,7 @@ import me.caseload.knockbacksync.player.PlayerData;
import me.caseload.knockbacksync.util.data.Pair;
import java.util.Queue;
import java.util.UUID;
public class PingSendListener extends PacketListenerAbstract {
@@ -30,7 +31,9 @@ public class PingSendListener extends PacketListenerAbstract {
if (event.isCancelled()) return;
PacketTypeCommon packetType = event.getPacketType();
PlayerData playerData = PlayerDataManager.getPlayerData(event.getUser().getUUID());
UUID playerUUID = event.getUser().getUUID();
if (playerUUID == null) return;
PlayerData playerData = PlayerDataManager.getPlayerData(playerUUID);
if (playerData == null) return;
if (playerData.pingStrategy == PingStrategy.KEEPALIVE && packetType.equals(PacketType.Play.Server.KEEP_ALIVE)) {