From ebe0e49745b6a95ebd8fe7ca41d775be03322743 Mon Sep 17 00:00:00 2001
From: bloodshot <jdroque@gmail.com>
Date: Thu, 9 Jan 2020 14:18:46 -0500
Subject: [PATCH] Fix claim context calculators.

---
 .../java/com/griefdefender/claim/ClaimContextCalculator.java    | 1 +
 .../main/java/com/griefdefender/provider/LuckPermsProvider.java | 2 ++
 .../java/com/griefdefender/claim/ClaimContextCalculator.java    | 1 +
 3 files changed, 4 insertions(+)

diff --git a/bukkit/src/main/java/com/griefdefender/claim/ClaimContextCalculator.java b/bukkit/src/main/java/com/griefdefender/claim/ClaimContextCalculator.java
index 4a2d8de..35d5a41 100644
--- a/bukkit/src/main/java/com/griefdefender/claim/ClaimContextCalculator.java
+++ b/bukkit/src/main/java/com/griefdefender/claim/ClaimContextCalculator.java
@@ -54,6 +54,7 @@ public class ClaimContextCalculator implements ContextCalculator<Player> {
             } else {
                 contextSet.accept(sourceClaim.getContext().getKey(), sourceClaim.getContext().getValue());
             }
+            contextSet.accept("server", GriefDefenderPlugin.getInstance().getPermissionProvider().getServerName());
         }
     }
 }
diff --git a/bukkit/src/main/java/com/griefdefender/provider/LuckPermsProvider.java b/bukkit/src/main/java/com/griefdefender/provider/LuckPermsProvider.java
index 84a0e14..ec2c83c 100644
--- a/bukkit/src/main/java/com/griefdefender/provider/LuckPermsProvider.java
+++ b/bukkit/src/main/java/com/griefdefender/provider/LuckPermsProvider.java
@@ -38,6 +38,7 @@ import com.griefdefender.api.permission.ResultTypes;
 import com.griefdefender.api.permission.flag.Flag;
 import com.griefdefender.api.permission.option.Option;
 import com.griefdefender.cache.PermissionHolderCache;
+import com.griefdefender.claim.ClaimContextCalculator;
 import com.griefdefender.claim.GDClaim;
 import com.griefdefender.permission.GDPermissionHolder;
 import com.griefdefender.permission.GDPermissionResult;
@@ -110,6 +111,7 @@ public class LuckPermsProvider implements PermissionProvider {
 
     public LuckPermsProvider() {
         this.luckPermsApi = Bukkit.getServicesManager().getRegistration(LuckPerms.class).getProvider();
+        this.luckPermsApi.getContextManager().registerCalculator(new ClaimContextCalculator());
     }
 
     public LuckPerms getApi() {
diff --git a/sponge/src/main/java/com/griefdefender/claim/ClaimContextCalculator.java b/sponge/src/main/java/com/griefdefender/claim/ClaimContextCalculator.java
index c04c590..8c496cf 100644
--- a/sponge/src/main/java/com/griefdefender/claim/ClaimContextCalculator.java
+++ b/sponge/src/main/java/com/griefdefender/claim/ClaimContextCalculator.java
@@ -60,6 +60,7 @@ public class ClaimContextCalculator implements ContextCalculator<Subject> {
                 } else {
                     accumulator.add(sourceClaim.getSpongeContext());
                 }
+                accumulator.add(new Context("server", GriefDefenderPlugin.getInstance().getPermissionProvider().getServerName()));
             }
         }