Fixed PC-707

Fixed arrows damaging the shooter.
Fixed all instances of arrows bouncing of targets.

Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java

@@ -44,6 +44,7 @@ public class CustomDamageEvent extends Event implements Cancellable
 	private boolean _damageeBrute = false;
 	private boolean _damageToLevel = true;
 	private boolean _arrowShow = true;
+	private boolean _projectileDamageSelf = false;
 
 	public CustomDamageEvent(LivingEntity damagee, LivingEntity damager, Projectile projectile, Location knockbackOrigin,
 			DamageCause cause, double damage, boolean knockback, boolean ignoreRate, boolean ignoreArmor, String initialSource,
@@ -169,6 +170,27 @@ public class CustomDamageEvent extends Event implements Cancellable
 		return _projectile;
 	}
 	
+	public boolean getProjectileDamageSelf()
+	{
+		return _projectileDamageSelf;
+	}
+	
+	public void setProjectileDamageSelf(boolean projectileDamageSelf)
+	{
+		_projectileDamageSelf = projectileDamageSelf;
+		if(!projectileDamageSelf)
+		{
+			_cancellers.remove("Self Projectile Damage");
+		}
+		else
+		{
+			if(!_cancellers.contains("Self Projectile Damage"))
+			{
+				_cancellers.add("Self Projectile Damage");
+			}
+		}
+	}
+	
 	public void setShowArrows(boolean show)
 	{
 		_arrowShow = show;

Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java

@@ -8,7 +8,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.bukkit.Bukkit;
 import org.bukkit.EntityEffect;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -241,18 +240,33 @@ public class DamageManager extends MiniPlugin
 		event.setCancelled(true);
 	}
 
-	@EventHandler(priority = EventPriority.HIGHEST)
+	/**
-	public void removeDemArrowsCrazyMan(EntityDamageEvent event)
+	 * Removes arrows after hit, especially in cases where arrows may bounce, like if the damage was cancelled.
+	 */
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void removeArrows(EntityDamageEvent event)
 	{
-		if (event.isCancelled())
+		Projectile projectile = GetProjectile(event);
-		{
-			Projectile projectile = GetProjectile(event);
 
-			if (projectile instanceof Arrow)
+		if (projectile instanceof Arrow)
-			{
+		{
-				projectile.teleport(new Location(projectile.getWorld(), 0, 0, 0));
+			projectile.teleport(new Location(projectile.getWorld(), 0, 0, 0));
-				projectile.remove();
+			projectile.remove();
-			}
+		}
+	}
+	
+	/**
+	 * Removes arrows after hit, especially in cases where arrows may bounce, like if the damage was cancelled.
+	 */
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void removeArrows(CustomDamageEvent event)
+	{
+		Projectile projectile = event.GetProjectile();
+
+		if (projectile instanceof Arrow)
+		{
+			projectile.teleport(new Location(projectile.getWorld(), 0, 0, 0));
+			projectile.remove();
 		}
 	}
 	/*
@@ -319,6 +333,12 @@ public class DamageManager extends MiniPlugin
 			event.SetCancelled("0 Health");
 			return;
 		}
+		
+		if (event.GetProjectile() != null && event.GetDamageeEntity().equals(event.GetProjectile().getShooter()) && !event.getProjectileDamageSelf())
+		{
+			event.SetCancelled("Self Projectile Damage");
+			return;
+		}
 
 		if (event.GetDamageePlayer() != null)
 		{
@@ -440,6 +460,8 @@ public class DamageManager extends MiniPlugin
 				Player player = event.GetDamagerPlayer(true);
 				if (player != null)
 				{
+					if (player.equals(event.GetDamageeEntity()) && !event.getProjectileDamageSelf()) return;
+					
 					player.playSound(player.getLocation(), Sound.ORB_PICKUP, 0.5f, 0.5f);
 				}
 			}
@@ -464,6 +486,11 @@ public class DamageManager extends MiniPlugin
 		if (event.GetDamageeEntity().getHealth() <= 0)
 			return;
 
+		if (event.GetProjectile() != null && 
+				event.GetDamageeEntity().equals(event.GetProjectile().getShooter()) && 
+				!event.getProjectileDamageSelf())
+			return;
+		
 		//Player Conditions
 		if (event.GetDamageePlayer() != null)
 		{
@@ -524,6 +551,7 @@ public class DamageManager extends MiniPlugin
 				trajectory.multiply(0.6 * knockback);
 				trajectory.setY(Math.abs(trajectory.getY()));
 				
+				//Special handling for projectiles
 				if(event.GetProjectile() != null && event.getKnockbackOrigin() == null)
 				{
 					trajectory = event.GetProjectile().getVelocity();