Skip to content
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

Jump to bottom

Implement permission for using SignPortals #96

Merged
merged 3 commits into from
Jul 14, 2024
Merged

Implement permission for using SignPortals #96

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0a382d
Clean up code and implement permission for using SignPortals
zax71 Apr 24, 2024
406a3d3
Implement requested changes
zax71 Apr 26, 2024
c82a4b0
Implement requested changes
zax71 Apr 27, 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
66 changes: 42 additions & 24 deletions src/main/java/com/onarandombox/MultiverseSignPortals/listeners/MVSPPlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import com.onarandombox.MultiverseCore.destination.DestinationFactory;
import com.onarandombox.MultiverseCore.enums.TeleportResult;
import com.onarandombox.MultiverseCore.utils.MVPermissions;
import com.onarandombox.MultiverseCore.utils.MVTravelAgent;
import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
import com.onarandombox.MultiverseSignPortals.MultiverseSignPortals;
import com.onarandombox.MultiverseSignPortals.exceptions.MoreThanOneSignFoundException;
Expand All @@ -29,18 +28,19 @@
import org.bukkit.event.player.PlayerPortalEvent;
import org.bukkit.permissions.PermissionDefault;

import java.util.logging.Level;

public class MVSPPlayerListener implements Listener {

private MultiverseSignPortals plugin;
private MVPermissions permissions;
private PortalDetector pd;
private static final String USE_PERMISSION = "multiverse.signportal.use";
private static final String VALIDATE_PERMISSION = "multiverse.signportal.validate";
private final MultiverseSignPortals plugin;
private final MVPermissions permissions;
private final PortalDetector pd;

public MVSPPlayerListener(MultiverseSignPortals plugin) {
this.plugin = plugin;
this.permissions = this.plugin.getCore().getMVPerms();
this.permissions.addPermission("multiverse.signportal.validate", PermissionDefault.OP);
this.permissions.addPermission(VALIDATE_PERMISSION, PermissionDefault.OP);
this.permissions.addPermission(USE_PERMISSION, PermissionDefault.TRUE);
this.pd = new PortalDetector(this.plugin);
}

Expand Down Expand Up @@ -83,28 +83,46 @@ public void playerPortal(PlayerPortalEvent event) {
*/
@EventHandler
public void playerInteract(PlayerInteractEvent event) {
// The event must not be canceled...
if (event.isCancelled()) {
return;
}
if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
if (event.getClickedBlock().getState() instanceof Sign) {
Logging.finer("Found a Sign!");
Sign s = (Sign) event.getClickedBlock().getState();
SignStatus status = this.pd.getSignStatus(s);
if (status == SignStatus.SignPortal) {

// We must be right-clicking...
if (event.getAction() != Action.RIGHT_CLICK_BLOCK) {
return;
}

// And it must be a sign
if (!(event.getClickedBlock().getState() instanceof Sign)) {
return;
}

Logging.finer("Found a Sign!");
Sign s = (Sign) event.getClickedBlock().getState();
SignStatus status = this.pd.getSignStatus(s);

Player player = event.getPlayer();
switch (status) {
case SignPortal:
if (permissions.hasPermission(player, USE_PERMISSION, false)) {
String destString = this.pd.processSign(s);
this.takePlayerToDestination(event.getPlayer(), destString);
event.setCancelled(true);
} else if (status == SignStatus.Disabled) {
this.pd.activateSignPortal(event.getPlayer(), ChatColor.RED + "Disabled", s);
event.setCancelled(true);
} else if (status == SignStatus.Legacy) {
this.pd.activateSignPortal(event.getPlayer(), ChatColor.AQUA + "Legacy", s);
event.setCancelled(true);
} else if (status == SignStatus.NetherPortalSign) {
event.setCancelled(true);
this.takePlayerToDestination(player, destString);
} else {
player.sendMessage(ChatColor.RED + "You do not have the required permission to use SignPortals (" + USE_PERMISSION + ")");
}
}
event.setCancelled(true);
break;
case Legacy:
this.pd.activateSignPortal(player, ChatColor.AQUA + "Legacy", s);
event.setCancelled(true);
break;
case Disabled:
this.pd.activateSignPortal(player, ChatColor.RED + "Disabled", s);
event.setCancelled(true);
break;
case NetherPortalSign:
event.setCancelled(true);
}
}

Expand Down
Loading