Skip to content

Commit 2eba6ec

Browse files
committed
Add support to stop erroring on Carpet Mod fake players
1 parent 8783dd0 commit 2eba6ec

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

common/src/main/java/me/caseload/knockbacksync/listener/PlayerDamageListener.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package me.caseload.knockbacksync.listener;
22

3+
import com.github.retrooper.packetevents.protocol.player.User;
34
import me.caseload.knockbacksync.Base;
45
import me.caseload.knockbacksync.manager.PlayerDataManager;
56
import me.caseload.knockbacksync.player.PlatformPlayer;
@@ -10,7 +11,10 @@ public void onPlayerDamage(PlatformPlayer victim, PlatformPlayer attacker) {
1011
if (!Base.INSTANCE.getConfigManager().isToggled())
1112
return;
1213

13-
PlayerData playerData = PlayerDataManager.getPlayerData(victim.getUser());
14+
User user = victim.getUser();
15+
if (user == null) return; // Prevent errors with fake players
16+
17+
PlayerData playerData = PlayerDataManager.getPlayerData(user);
1418
if (playerData == null)
1519
return;
1620

common/src/main/java/me/caseload/knockbacksync/listener/PlayerKnockbackListener.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package me.caseload.knockbacksync.listener;
22

3+
import com.github.retrooper.packetevents.protocol.player.User;
34
import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState;
45
import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
56
import com.github.retrooper.packetevents.util.Vector3d;
@@ -14,7 +15,10 @@ public void onPlayerVelocity(PlatformPlayer victim, Vector3d velocity) {
1415
if (!Base.INSTANCE.getConfigManager().isToggled())
1516
return;
1617

17-
PlayerData victimPlayerData = PlayerDataManager.getPlayerData(victim.getUser());
18+
User user = victim.getUser();
19+
if (user == null) return; // Prevent errors with fake players
20+
21+
PlayerData victimPlayerData = PlayerDataManager.getPlayerData(user);
1822
if (victimPlayerData == null)
1923
return;
2024

0 commit comments

Comments
 (0)