Merge branch 'master' into spigot

This commit is contained in:
sekwah41 2018-02-01 21:45:58 +00:00
commit c6713ed395
2 changed files with 3 additions and 2 deletions

View File

@ -90,7 +90,8 @@ public class CoreListeners {
*/
public void playerInteractWithBlock(PlayerContainer player, String materialName, String itemName,
PortalLocation blockLoc, boolean leftClick) {
if(materialName.equalsIgnoreCase(this.portalsCore.getConfig().getSelectorMaterial())
if((player.isOp() || player.hasPermission("advancedportals.createportal")) &&
materialName.equalsIgnoreCase(this.portalsCore.getConfig().getSelectorMaterial())
&& (!this.portalsCore.getConfig().getUseOnlySpecialAxe() || itemName.equals("\u00A7ePortal Region Selector"))) {
AdvancedPortalsCore.getPortalManager().playerSelectorActivate(player, blockLoc, leftClick);
}

View File

@ -5,7 +5,7 @@ package com.sekwah.advancedportals.core.util;
*/
public class Config {
private boolean useOnlySpecialAxe;
private boolean useOnlySpecialAxe = true;
private String selectorMaterial = "IRON_AXE";