Merge pull request #412 from grasshopperMatt/master

Fixed healingwaters shift functionality, Added BendingDamageEvent

src/com/projectkorra/projectkorra/GeneralMethods.java

@@ -93,6 +93,7 @@ import com.projectkorra.projectkorra.command.Commands;
 import com.projectkorra.projectkorra.configuration.ConfigManager;
 import com.projectkorra.projectkorra.earthbending.EarthBlast;
 import com.projectkorra.projectkorra.earthbending.EarthPassive;
+import com.projectkorra.projectkorra.event.BendingDamageEvent;
 import com.projectkorra.projectkorra.event.BendingReloadEvent;
 import com.projectkorra.projectkorra.event.BindChangeEvent;
 import com.projectkorra.projectkorra.event.EntityBendingDeathEvent;
@@ -371,6 +372,8 @@ public class GeneralMethods {
 				EntityBendingDeathEvent event = new EntityBendingDeathEvent(entity, player, damage, ability);
 				Bukkit.getServer().getPluginManager().callEvent(event);
 			}
+			BendingDamageEvent event = new BendingDamageEvent();
+			Bukkit.getServer().getPluginManager().callEvent(event);
 			((LivingEntity) entity).damage(damage, player);
 			entity.setLastDamageCause(new EntityDamageByEntityEvent(player, entity, DamageCause.CUSTOM, damage));
 			if (Bukkit.getPluginManager().isPluginEnabled("NoCheatPlus")) {

src/com/projectkorra/projectkorra/event/BendingDamageEvent.java

@@ -0,0 +1,31 @@
+package com.projectkorra.projectkorra.event;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class BendingDamageEvent extends Event implements Cancellable {
+	
+	private static final HandlerList handlers = new HandlerList();
+	private boolean cancelled;
+	
+	public BendingDamageEvent() {
+		this.cancelled = false;
+	}
+
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+	@Override
+	public boolean isCancelled() {
+		return cancelled;
+	}
+
+	@Override
+	public void setCancelled(boolean cancel) {
+		this.cancelled = cancel;
+	}
+
+}

src/com/projectkorra/projectkorra/waterbending/HealingWaters.java

@@ -36,22 +36,20 @@ public class HealingWaters extends HealingAbility {
 			}
 		}
 	}
-
+	
 	private static void heal(Player player) {
 		if (inWater(player)) {
 			if (player.isSneaking()) {
 				Entity entity = GeneralMethods.getTargetedEntity(player, getRadius());
-				if (entity instanceof LivingEntity && inWater(entity)) {
+				if (entity == null) {
-					if (getShiftRequired() && player.isSneaking()) {
+						giveHP(player);
-						giveHPToEntity((LivingEntity) entity);
+				} else {
-					} else if (!getShiftRequired()) {
+					giveHPToEntity((LivingEntity) entity);
-						giveHPToEntity((LivingEntity) entity);
-					}
 				}
 			} else {
-				if (getShiftRequired() && player.isSneaking()) {
+				if (getShiftRequired()) {
-					giveHP(player);
+					return;
-				} else if (!getShiftRequired()) {
+				} else {
 					giveHP(player);
 				}
 			}