Added rabbits to safe animals, use animal entity references.

Author: jcdesimp

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

@@ -12,10 +12,7 @@
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;
 import org.bukkit.event.hanging.HangingPlaceEvent;
-import org.bukkit.event.player.PlayerBucketEmptyEvent;
-import org.bukkit.event.player.PlayerBucketFillEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.*;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.Arrays;
@@ -174,6 +171,16 @@ public void paintingFrameBreak(HangingBreakByEntityEvent event){
 
     }
 
+    @EventHandler(priority = EventPriority.HIGH)
+    public void interactWithArmorStand(PlayerInteractAtEntityEvent event) {
+        //todo implement event handler
+    }
+
+    //todo check projectiles hit armor stand
+    //todo check creation of armor stand
+    //todo check destruction of armor stand
+
+
     @EventHandler(priority = EventPriority.HIGH)
     public void removeItemFromFrame(EntityDamageByEntityEvent event) {
         Entity victim = event.getEntity();
@@ -268,6 +275,7 @@ public void paintingFramePlace(HangingPlaceEvent event){
         if(land == null){
             return;
         }
+
         if(placer.getType().toString().equals("PLAYER")){
             Player p = (Player)placer;
             if(!land.hasPermTo(p, this)){
@@ -281,7 +289,7 @@ public void paintingFramePlace(HangingPlaceEvent event){
 
 
     @EventHandler(priority = EventPriority.HIGH)
-    public void CropTrampleorFireCharge(PlayerInteractEvent event) {
+    public void CropTrampleOrFireCharge(PlayerInteractEvent event) {
         if(event.getClickedBlock()==null){
             return;
         }

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

@@ -4,13 +4,16 @@
 import com.jcdesimp.landlord.persistantData.OwnedLand;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Ocelot;
 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 javax.swing.text.html.parser.Entity;
 import java.util.Arrays;
 
 /**
@@ -74,9 +77,11 @@ public HarmAnimals() {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void animalDamage(EntityDamageByEntityEvent event){
-        String[] safeAnimals = {"OCELOT","WOLF","HORSE","COW","PIG","MUSHROOM_COW","SHEEP","CHICKEN"};
+        //String[] ssafeAnimals = {"OCELOT","WOLF","HORSE","COW","PIG","MUSHROOM_COW","SHEEP","CHICKEN"};
+        EntityType[] safeAnimals = {EntityType.OCELOT, EntityType.WOLF, EntityType.HORSE, EntityType.COW, EntityType.PIG,
+            EntityType.MUSHROOM_COW, EntityType.SHEEP, EntityType.CHICKEN, EntityType.RABBIT};
         org.bukkit.entity.Entity victim = event.getEntity();
-        if(!Arrays.asList(safeAnimals).contains(victim.getType().toString())){
+        if(!Arrays.asList(safeAnimals).contains(victim.getType())){
             return;
         }
 
@@ -91,7 +96,7 @@ public void animalDamage(EntityDamageByEntityEvent event){
             }
             if(!land.hasPermTo(p, this)){
 
-                    p.sendMessage(ChatColor.RED+"You cannot harm animals on this land.");
+                p.sendMessage(ChatColor.RED+"You cannot harm animals on this land.");
 
                 event.setCancelled(true);