Fix Vault integration + remove DummyFAWE

This commit is contained in:
IronApollo
2020-09-14 21:18:06 -04:00
parent 4243e8e86b
commit 9431f7c189
5 changed files with 13 additions and 127 deletions

View File

@ -26,6 +26,7 @@ import com.boydti.fawe.config.Settings;
import com.boydti.fawe.object.RunnableVal;
import com.boydti.fawe.util.TaskManager;
import com.sk89q.util.StringUtil;
import com.sk89q.wepif.VaultResolver;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseItemStack;
@ -240,13 +241,15 @@ public class BukkitPlayer extends AbstractPlayerActor {
* Permissions are used to managing WorldEdit region restrictions
* - The `/wea` command will give/remove the required bypass permission
*/
if (Fawe.<FaweBukkit>imp().getVault() == null || Fawe.<FaweBukkit> imp().getVault().permission == null) {
player.addAttachment(plugin).setPermission(permission, value);
} else if (value) {
if (!Fawe.<FaweBukkit> imp().getVault().permission.playerAdd(player, permission)) {
if(VaultResolver.perms != null){
if(value){
if(!VaultResolver.perms.playerAdd(player, permission)){
player.addAttachment(plugin).setPermission(permission, value);
}
}else if(!VaultResolver.perms.playerRemove(player, permission)){
player.addAttachment(plugin).setPermission(permission, value);
}
} else if (!Fawe.<FaweBukkit>imp().getVault().permission.playerRemove(player, permission)) {
}else{
player.addAttachment(plugin).setPermission(permission, value);
}
}