diff --git a/bukkit/src/main/java/com/griefdefender/provider/PlaceholderProvider.java b/bukkit/src/main/java/com/griefdefender/provider/PlaceholderProvider.java
index 7f99407..3fc11b7 100644
--- a/bukkit/src/main/java/com/griefdefender/provider/PlaceholderProvider.java
+++ b/bukkit/src/main/java/com/griefdefender/provider/PlaceholderProvider.java
@@ -154,6 +154,11 @@ public String onRequest(OfflinePlayer offlinePlayer, String identifier) {
                         return "";
                     }
                     return String.valueOf(PlayerUtil.getInstance().canPlayerPvP((GDClaim) claim, user));
+                case "pvp_combat_active" :
+                    if (claim == null) {
+                        return "";
+                    }
+                    return String.valueOf(playerData.getPvpCombatTimeRemaining((GDClaim) claim) > 0);
                 case "blocks_total" :
                     final int initial = playerData.getInitialClaimBlocks();
                     final int accrued = playerData.getAccruedClaimBlocks();