Skip to content

Fix a NPE when a user don't exist for packetevents #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rexlManu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix a NPE when a user don't exist for packetevents #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f7c48e
build: update packetevents declaration
rexlManu Jun 23, 2024
c3f75b6
fix: fake players throw NPE when trying to get protocol version
rexlManu Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spigot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies {
exclude("com.convallyria.languagy.libs")
}
implementation("org.bstats:bstats-bukkit:3.0.2")
implementation("com.github.retrooper.packetevents:spigot:${properties["packetevents_version"]}")
implementation("com.github.retrooper:packetevents-spigot:${properties["packetevents_version"]}")
}

tasks {
Expand Down
17 changes: 13 additions & 4 deletions spigot/src/main/java/com/convallyria/forcepack/spigot/util/ProtocolUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,19 @@
public class ProtocolUtil {

public static int getProtocolVersion(Player player) {
final boolean viaversion = Bukkit.getPluginManager().isPluginEnabled("ViaVersion");
return viaversion
? Via.getAPI().getPlayerVersion(player)
: PacketEvents.getAPI().getPlayerManager().getUser(player).getClientVersion().getProtocolVersion();
if(Bukkit.getPluginManager().isPluginEnabled("ViaVersion")) {
return Via.getAPI().getPlayerVersion(player);
}

final User user = PacketEvents.getAPI().getPlayerManager().getUser(player);

// PacketEvents will not create users for fake online players
// so we can safely assume that if the user is null, the player is fake
if(user == null) {
return -1;
}

return user.getClientVersion().getProtocolVersion();
}

private static boolean warnedBadPlugin;
Expand Down