Upstream
/
war
mirror of https://github.com/taoneill/war.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #320, add permission when playing in a zone 

When a player enters an example zone named "Castle_Wars", the following permissions are granted:
- war.playing (Added for any zone)
- war.playing.castle_wars (Added for this zone, formed by the lower case of the zone name)

To grant additional permissions from these, such as 'crackshot.use', you should modify Bukkit's permissions.yml to create a parent node for either war.playing or the zone-specific node with child nodes.
http://bukkit.gamepedia.com/Permissions.yml

Example:

war.playing:
       description: Allow use of gun plugins inside war zones only
       default: false
       children:
          crackshot.use: true
war.playing.castle_wars:
       description: Allow use of craft book elevators inside Castle_Wars only
       default: false
       children:
          craftbook.use: true
This commit is contained in:
Connor Monahan 2017-07-20 16:10:34 -04:00
parent b7138d65bd
commit ef26173ba1
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
war/src/main/java/com/tommytony/war/Warzone.java
View File

@ -39,6 +39,7 @@ import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.permissions.Permissible;
import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.potion.PotionEffect;
import org.bukkit.scoreboard.DisplaySlot;
import org.bukkit.scoreboard.Objective;
@ -118,6 +119,7 @@ public class Warzone {
private HashMap<String, Integer> killCount = new HashMap<String, Integer>();
private final List<Player> respawn = new ArrayList<Player>();
private final List<String> reallyDeadFighters = new ArrayList<String>();
private HashMap<Player, PermissionAttachment> attachments = new HashMap<Player, PermissionAttachment>();
private List<LogKillsDeathsJob.KillsDeathsRecord> killsDeathsTracker = new ArrayList<KillsDeathsRecord>();
@ -991,6 +993,10 @@ public class Warzone {
if (player.getWorld() != this.getWorld()) {
player.teleport(this.getWorld().getSpawnLocation());
}
PermissionAttachment attachment = player.addAttachment(War.war);
this.attachments.put(player, attachment);
attachment.setPermission("war.playing", true);
attachment.setPermission("war.playing." + this.getName().toLowerCase(), true);
team.addPlayer(player);
team.resetSign();
if (this.hasPlayerState(player.getName())) {
@ -1213,6 +1219,7 @@ public class Warzone {
playerTeam.removePlayer(player);
this.broadcast("leave.broadcast", playerTeam.getKind().getColor() + player.getName() + ChatColor.WHITE);
playerTeam.resetSign();
player.removeAttachment(this.attachments.remove(player));
if (this.getPlayerCount() == 0 && this.getWarzoneConfig().getBoolean(WarzoneConfig.RESETONEMPTY)) {
// reset the zone for a new game when the last player leaves
for (Team team : this.getTeams()) {