From 35de391fce1ed1ac8cf1128de4d72cd105f6e71c Mon Sep 17 00:00:00 2001
From: MistPhizzle <mistphizzle@gmail.com>
Date: Sun, 24 Aug 2014 10:49:13 -0400
Subject: [PATCH] Clean up Conflicts

Conflicts:
	src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java
	src/com/projectkorra/ProjectKorra/firebending/Lightning.java
---
 .../projectkorra/ProjectKorra/Ability/StockAbilities.java  | 6 +-----
 src/com/projectkorra/ProjectKorra/PKListener.java          | 1 -
 .../projectkorra/ProjectKorra/firebending/Lightning.java   | 7 ++-----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java b/src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java
index 56ec4781..d7884d01 100644
--- a/src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java
+++ b/src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java
@@ -18,11 +18,7 @@ public enum StockAbilities {
 	AvatarState,
 	
 	// Project Korra
-<<<<<<< HEAD
-	Extraction, Smokescreen, Combustion, LavaSurge;
-=======
-	Extraction, Smokescreen, Combustion, BreathSphere;
->>>>>>> origin/master
+	Extraction, Smokescreen, Combustion, LavaSurge, BreathSphere;
 	
 	private enum AirbendingAbilities {
 		AirBlast, AirBubble, AirShield, AirSuction, AirSwipe, Tornado, AirScooter, AirSpout, AirBurst, BreathSphere;
diff --git a/src/com/projectkorra/ProjectKorra/PKListener.java b/src/com/projectkorra/ProjectKorra/PKListener.java
index 0ad0df5a..d9b318d8 100644
--- a/src/com/projectkorra/ProjectKorra/PKListener.java
+++ b/src/com/projectkorra/ProjectKorra/PKListener.java
@@ -138,7 +138,6 @@ public class PKListener implements Listener {
 
 		if (event.getDamager() != null) {
 			if (LavaWave.isBlockInWave(event.getDamager())) {
-				Bukkit.getServer().broadcastMessage("Hit by LavaSurge Lava");
 				event.setCancelled(true);
 			}
 		}
diff --git a/src/com/projectkorra/ProjectKorra/firebending/Lightning.java b/src/com/projectkorra/ProjectKorra/firebending/Lightning.java
index 82ad0b46..ca85dcd2 100644
--- a/src/com/projectkorra/ProjectKorra/firebending/Lightning.java
+++ b/src/com/projectkorra/ProjectKorra/firebending/Lightning.java
@@ -159,19 +159,16 @@ public class Lightning {
 				if (en instanceof LivingEntity) {
 					if (Methods.isWater(en.getLocation().getBlock())) {
 						Methods.damageEntity(player, entity, (int) damage);
+						Methods.breakBreathbendingHold(entity);
 					}
 				}
 			}
 		} else {
 			if (distance > strikeradius) return;
 			Methods.damageEntity(player, entity, (int) damage);
+			Methods.breakBreathbendingHold(entity);
 		}
 		hitentities.add(entity);
-<<<<<<< HEAD
-=======
-		Methods.damageEntity(player, entity, (int) damage);
-		Methods.breakBreathbendingHold(entity);
->>>>>>> origin/master
 	}
 
 	public static boolean isNearbyChannel(Location location) {