Skip to content

Fix NPE when banning/unbanning person that isn't known #652

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
svaningelgem wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix NPE when banning/unbanning person that isn't known #652

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9bddaa
Fix NPE when banning/unbanning person that isn't known in the minecra…
svaningelgem Mar 12, 2025
e58d0bc
First checking if a user by that name exists.
svaningelgem Apr 30, 2025
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
45 changes: 39 additions & 6 deletions bukkit/src/main/java/me/leoko/advancedban/bukkit/listener/InternalListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import me.leoko.advancedban.utils.PunishmentType;
import org.bukkit.BanList;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;

Expand All @@ -15,28 +16,60 @@
* @author Beelzebu
*/
public class InternalListener implements Listener {


private boolean canSafelyBan(String playerName) {
boolean userKnown = false;
if (playerName != null) {
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerName);
userKnown = offlinePlayer.hasPlayedBefore() || offlinePlayer.isOnline();
}

if (!userKnown) {
Bukkit.getLogger().warning("Cannot ban " + playerName + ": player has never joined and GameProfile may be null");
}

return userKnown;
}

private void ban(BanList banlist, PunishmentEvent e) {
String playerName = e.getPunishment().getName();
if ( !canSafelyBan(playerName)) {
return;
}

banlist.addBan(playerName, e.getPunishment().getReason(), new Date(e.getPunishment().getEnd()), e.getPunishment().getOperator());
}

@EventHandler
public void onPunish(PunishmentEvent e) {
BanList banlist;
if (e.getPunishment().getType().equals(PunishmentType.BAN) || e.getPunishment().getType().equals(PunishmentType.TEMP_BAN)) {
banlist = Bukkit.getBanList(BanList.Type.NAME);
banlist.addBan(e.getPunishment().getName(), e.getPunishment().getReason(), new Date(e.getPunishment().getEnd()), e.getPunishment().getOperator());
ban(banlist, e);
} else if (e.getPunishment().getType().equals(PunishmentType.IP_BAN) || e.getPunishment().getType().equals(PunishmentType.TEMP_IP_BAN)) {
banlist = Bukkit.getBanList(BanList.Type.IP);
banlist.addBan(e.getPunishment().getName(), e.getPunishment().getReason(), new Date(e.getPunishment().getEnd()), e.getPunishment().getOperator());
ban(banlist, e);
}
}

private void pardon(BanList banlist, RevokePunishmentEvent e) {
String playerName = e.getPunishment().getName();
if ( !canSafelyBan(playerName)) {
return;
}

banlist.pardon(playerName);
}

@EventHandler
public void onRevokePunishment(RevokePunishmentEvent e) {
BanList banlist;
if (e.getPunishment().getType().equals(PunishmentType.BAN) || e.getPunishment().getType().equals(PunishmentType.TEMP_BAN)) {
banlist = Bukkit.getBanList(BanList.Type.NAME);
banlist.pardon(e.getPunishment().getName());
pardon(banlist, e);
} else if (e.getPunishment().getType().equals(PunishmentType.IP_BAN) || e.getPunishment().getType().equals(PunishmentType.TEMP_IP_BAN)) {
banlist = Bukkit.getBanList(BanList.Type.IP);
banlist.pardon(e.getPunishment().getName());
pardon(banlist, e);
}
}
}