Skip to content

Don't allow tp to jailed friends, remove bed spawn in nabworld for nabsbegone #37

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

Merged
froobynooby merged 1 commit into from
Jan 11, 2026
Merged

Don't allow tp to jailed friends, remove bed spawn in nabworld for nabsbegone #37

Show file tree
Hide file tree
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
14 changes: 14 additions & 0 deletions src/main/java/com/froobworld/nabsuite/modules/basics/command/TeleportCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,20 @@ public Command.Builder<CommandSender> populateBuilder(Command.Builder<CommandSen
},
"Player has teleportation disabled"
),
new ArgumentPredicate<>(
false,
(context, player) -> {
if (context.getSender().hasPermission(TELEPORT_ALL_PERM)) {
return true;
}
AdminModule adminModule = basicsModule.getPlugin().getModule(AdminModule.class);
if (adminModule != null) {
return adminModule.getPunishmentManager().getPunishments(player.getUniqueId()).getJailPunishment() == null;
}
return true;
},
"Player has teleportation disabled"
),
new ArgumentPredicate<>(
false,
(context, player) -> {
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/froobworld/nabsuite/modules/nabmode/command/NabsBeGoneCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,11 @@ public NabsBeGoneCommand(NabModeModule nabModeModule) {

private void sendAway(Player player) {
Location backLocation = basicsModule.getBackManager().getBackLocation(player);
if (backLocation == null || nabDimensionManager.getNabWorld().equals(backLocation.getWorld())) {
backLocation = player.getRespawnLocation();
Location respawnLocation = player.getRespawnLocation();
if (respawnLocation != null && nabDimensionManager.getNabWorld().equals(respawnLocation.getWorld())) {
player.setRespawnLocation(null);
} else if (backLocation == null || nabDimensionManager.getNabWorld().equals(backLocation.getWorld())) {
backLocation = respawnLocation;
}
if (backLocation == null) {
backLocation = basicsModule.getSpawnManager().getSpawnLocation();
Expand Down