Added default PvP flag.

Author: jcdesimp

src/com/jcdesimp/landlord/Landlord.java

@@ -149,6 +149,9 @@ public void onEnable() {
         if(getConfig().getBoolean("enabled-flags.openDoor")) {
             flagManager.registerFlag(new OpenDoor());
         }
+        if(getConfig().getBoolean("enabled-flags.pvp")) {
+            flagManager.registerFlag(new PVP());
+        }
         //flagManager.registerFlag(new OpenDoorDUPE1());
         //flagManager.registerFlag(new OpenDoorDUPE2());
         //flagManager.registerFlag(new OpenDoorDUPE3());

src/com/jcdesimp/landlord/landFlags/HarmAnimals.java

@@ -73,7 +73,7 @@ public HarmAnimals() {
      */
 
     @EventHandler(priority = EventPriority.HIGH)
-    public void animalKill(EntityDamageByEntityEvent event){
+    public void animalDamage(EntityDamageByEntityEvent event){
         String[] safeAnimals = {"OCELOT","WOLF","HORSE","COW","PIG","MUSHROOM_COW","SHEEP","CHICKEN"};
         org.bukkit.entity.Entity victim = event.getEntity();
         if(!Arrays.asList(safeAnimals).contains(victim.getType().toString())){

src/com/jcdesimp/landlord/landFlags/PVP.java

@@ -0,0 +1,91 @@
+package com.jcdesimp.landlord.landFlags;
+
+import com.jcdesimp.landlord.landManagement.Landflag;
+import com.jcdesimp.landlord.persistantData.OwnedLand;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.Arrays;
+
+/**
+ * File created by jcdesimp on 5/24/14.
+ */
+
+/*
+ *******************************************************
+ * All flags need to extend the abstract Landflag class
+ *******************************************************
+ */
+public class PVP extends Landflag {
+
+    public PVP() {
+        super(
+                "PVP",                                          //Display name (will be displayed to players)
+                "Gives permission to attack|" +
+                        "players on this land|" ,
+                new ItemStack(Material.IRON_SWORD),              //Itemstack (represented in and manager)
+                "Allowed PvP",                                    //Text shown in manager for granted permission
+                "can hurt other players.",                        //Description in manager for granted permission (ex: Friendly players <desc>)
+                "Denied PvP",                                     //Text shown in manager for denied permission
+                "cannot hurt other players."                      //Desciption in manager for denied permission (ex: Regular players <desc>)
+        );
+    }
+
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void playerDamage(EntityDamageByEntityEvent event){
+        //String[] safeAnimals = {"OCELOT","WOLF","HORSE","COW","PIG","MUSHROOM_COW","SHEEP","CHICKEN"};
+        org.bukkit.entity.Entity victim = event.getEntity();
+        if(!(victim instanceof Player)){
+            return;
+        }
+
+
+        org.bukkit.entity.Entity attacker = event.getDamager();
+
+        if(attacker.getType().toString().equals("PLAYER")){
+            Player p = (Player)attacker;
+            OwnedLand land = OwnedLand.getApplicableLand(victim.getLocation());
+            if(land==null){
+                return;
+            }
+            if(!land.hasPermTo(p, this)){
+
+                p.sendMessage(ChatColor.RED+"You cannot harm other players on this land.");
+
+                event.setCancelled(true);
+
+            }
+
+        } else if(attacker.getType().toString().equalsIgnoreCase("Arrow") || attacker.getType().toString().equalsIgnoreCase("SPLASH_POTION")){
+            Projectile a = (Projectile)attacker;
+            Player p;
+            if(a.getShooter() instanceof Player){
+                OwnedLand land = OwnedLand.getApplicableLand(victim.getLocation());
+                p = (Player)a.getShooter();
+                if(land==null){
+                    return;
+                }
+                //System.out.println(a.getType());
+                if(!land.hasPermTo(p, this)){
+                    if(a.getType().toString().equals("ARROW")) {
+                        p.sendMessage(ChatColor.RED + "You cannot harm other players on this land.");
+                    }
+                    a.remove();
+                    event.setCancelled(true);
+                }
+            }
+
+
+        }
+    }
+
+
+
+}

src/com/jcdesimp/landlord/landMap/LandMap.java

@@ -89,7 +89,7 @@ private Scoreboard displayMap(Player p){
 
 
             //THIS BETTER NOT STAY!!!!!!
-            /*class myOfflinePlayer implements OfflinePlayer {
+            class myOfflinePlayer implements OfflinePlayer {
                 String name;
 
                 public myOfflinePlayer(String name){
@@ -165,10 +165,10 @@ public boolean isOp(){
                     return false;
                 }
 
-            }*/
+            }
 
-            OfflinePlayer ofp = Bukkit.getOfflinePlayer(mapData[i].substring(5,17));
-            //OfflinePlayer ofp = new myOfflinePlayer(mapData[i].substring(5,17));
+            //OfflinePlayer ofp = Bukkit.getOfflinePlayer(mapData[i].substring(5,17));
+            OfflinePlayer ofp = new myOfflinePlayer(mapData[i].substring(5,17));
             //String ofp = mapData[i].substring(5,17);
 
 

src/config.yml

@@ -44,6 +44,7 @@
 #    tntDamage: true
 #    useContainers: true
 #    useRedstone: true
+#    pvp: true
 # #### CONFIGURE OPTIONS BELOW ####
 
 options:
@@ -72,6 +73,7 @@ enabled-flags:
   tntDamage: true
   useContainers: true
   useRedstone: true
+  pvp: true