Skip to content

Guard null bastion group in the BSI overlay #33

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
grepsedawk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Guard null bastion group in the BSI overlay #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion plugins/bastion-paper/src/main/java/isaac/bastion/listeners/ModeListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import vg.civcraft.mc.civmodcore.players.settings.SettingChangeListener;
import vg.civcraft.mc.civmodcore.players.settings.impl.DisplayLocationSetting;
import vg.civcraft.mc.namelayer.NameLayerAPI;
import vg.civcraft.mc.namelayer.group.Group;
import vg.civcraft.mc.namelayer.permission.PermissionType;

public class ModeListener implements Listener {
Expand Down Expand Up @@ -110,7 +111,11 @@ private void updateDisplayedInformation(Player player, Location location) {
Set<BastionType> alliedBastions = new HashSet<>();
Set<BastionType> enemyBastions = new HashSet<>();
for (BastionBlock bastion : bastionBlocks) {
if (NameLayerAPI.getGroupManager().hasAccess(bastion.getGroup(), player.getUniqueId(), placePerm)) {
// getGroup() is null when the bastion's reinforcement isn't loaded (its block sits on an
// unloaded chunk at the field edge). Treat that as not-allied without asking hasAccess,
// which otherwise logs a stack trace for the null group on every move event.
Group group = bastion.getGroup();
if (group != null && NameLayerAPI.getGroupManager().hasAccess(group, player.getUniqueId(), placePerm)) {
alliedBastions.add(bastion.getType());
} else {
enemyBastions.add(bastion.getType());
Expand Down