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

Add 'pvp_combat_active' placeholder. Fixes #306

This commit is contained in:
bloodshot 2020-11-13 17:51:42 -05:00
parent 96d3ca5c21
commit afd3d4098e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bukkit/src/main/java/com/griefdefender/provider/PlaceholderProvider.java
View File

@ -154,6 +154,11 @@ public class PlaceholderProvider {
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();