Skip to content

Commit 406a3d3

Browse files
committed
Implement requested changes
1 parent c0a382d commit 406a3d3

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/main/java/com/onarandombox/MultiverseSignPortals/listeners/MVSPPlayerListener.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@
3434
public class MVSPPlayerListener implements Listener {
3535

3636
private static final String USE_PERMISSION = "multiverse.signportal.use";
37+
private static final String VALIDATE_PERMISSION = "multiverse.signportal.validate";
3738
private final MultiverseSignPortals plugin;
3839
private final MVPermissions permissions;
3940
private final PortalDetector pd;
4041

4142
public MVSPPlayerListener(MultiverseSignPortals plugin) {
4243
this.plugin = plugin;
4344
this.permissions = this.plugin.getCore().getMVPerms();
44-
this.permissions.addPermission("multiverse.signportal.validate", PermissionDefault.OP);
45+
this.permissions.addPermission(VALIDATE_PERMISSION, PermissionDefault.OP);
4546
this.permissions.addPermission(USE_PERMISSION, PermissionDefault.TRUE);
4647
this.pd = new PortalDetector(this.plugin);
4748
}
@@ -85,7 +86,7 @@ public void playerPortal(PlayerPortalEvent event) {
8586
*/
8687
@EventHandler
8788
public void playerInteract(PlayerInteractEvent event) {
88-
Player player = event.getPlayer();
89+
8990

9091
// The event must not be canceled...
9192
if (event.isCancelled()) {
@@ -106,22 +107,23 @@ public void playerInteract(PlayerInteractEvent event) {
106107
Sign s = (Sign) event.getClickedBlock().getState();
107108
SignStatus status = this.pd.getSignStatus(s);
108109

110+
Player player = event.getPlayer();
109111
switch (status) {
110112
case SignPortal:
111113
if (permissions.hasPermission(player, USE_PERMISSION, false)) {
112114
String destString = this.pd.processSign(s);
113-
this.takePlayerToDestination(event.getPlayer(), destString);
115+
this.takePlayerToDestination(player, destString);
114116
} else {
115117
player.sendMessage(ChatColor.RED + "You do not have the required permission to use SignPortals (" + USE_PERMISSION + ")");
116118
}
117119
event.setCancelled(true);
118120
break;
119121
case Legacy:
120-
this.pd.activateSignPortal(event.getPlayer(), ChatColor.AQUA + "Legacy", s);
122+
this.pd.activateSignPortal(player, ChatColor.AQUA + "Legacy", s);
121123
event.setCancelled(true);
122124
break;
123125
case Disabled:
124-
this.pd.activateSignPortal(event.getPlayer(), ChatColor.RED + "Disabled", s);
126+
this.pd.activateSignPortal(player, ChatColor.RED + "Disabled", s);
125127
event.setCancelled(true);
126128
break;
127129
case NetherPortalSign:

0 commit comments

Comments
 (0)