Upstream
/
GriefDefender
mirror of https://github.com/bloodmc/GriefDefender.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix claim context calculators.

This commit is contained in:
bloodshot 2020-01-09 14:18:46 -05:00
parent eca403bf1d
commit ebe0e49745
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bukkit/src/main/java/com/griefdefender/claim/ClaimContextCalculator.java
View File

@ -54,6 +54,7 @@ public class ClaimContextCalculator implements ContextCalculator<Player> {
} else { } else {
contextSet.accept(sourceClaim.getContext().getKey(), sourceClaim.getContext().getValue()); contextSet.accept(sourceClaim.getContext().getKey(), sourceClaim.getContext().getValue());
} }
contextSet.accept("server", GriefDefenderPlugin.getInstance().getPermissionProvider().getServerName());
} }
} }
} }

2
bukkit/src/main/java/com/griefdefender/provider/LuckPermsProvider.java
View File

@ -38,6 +38,7 @@ import com.griefdefender.api.permission.ResultTypes;
import com.griefdefender.api.permission.flag.Flag; import com.griefdefender.api.permission.flag.Flag;
import com.griefdefender.api.permission.option.Option; import com.griefdefender.api.permission.option.Option;
import com.griefdefender.cache.PermissionHolderCache; import com.griefdefender.cache.PermissionHolderCache;
import com.griefdefender.claim.ClaimContextCalculator;
import com.griefdefender.claim.GDClaim; import com.griefdefender.claim.GDClaim;
import com.griefdefender.permission.GDPermissionHolder; import com.griefdefender.permission.GDPermissionHolder;
import com.griefdefender.permission.GDPermissionResult; import com.griefdefender.permission.GDPermissionResult;
@ -110,6 +111,7 @@ public class LuckPermsProvider implements PermissionProvider {
public LuckPermsProvider() { public LuckPermsProvider() {
this.luckPermsApi = Bukkit.getServicesManager().getRegistration(LuckPerms.class).getProvider(); this.luckPermsApi = Bukkit.getServicesManager().getRegistration(LuckPerms.class).getProvider();
this.luckPermsApi.getContextManager().registerCalculator(new ClaimContextCalculator());
} }
public LuckPerms getApi() { public LuckPerms getApi() {

1
sponge/src/main/java/com/griefdefender/claim/ClaimContextCalculator.java
View File

@ -60,6 +60,7 @@ public class ClaimContextCalculator implements ContextCalculator<Subject> {
} else { } else {
accumulator.add(sourceClaim.getSpongeContext()); accumulator.add(sourceClaim.getSpongeContext());
} }
accumulator.add(new Context("server", GriefDefenderPlugin.getInstance().getPermissionProvider().getServerName()));
} }
} }