Removed Cannon Bow's Damaging effect

This commit is contained in:
alisolarflare 2016-11-26 00:18:53 -05:00
parent 4c0dae261a
commit 68f8a3fd77
2 changed files with 18 additions and 4 deletions

View file

@ -15,6 +15,6 @@ public class MagicComponent extends Component{
registerListener(plugin, new AliArrowListener(plugin)); registerListener(plugin, new AliArrowListener(plugin));
registerListener(plugin, new BoomBowDeathListener()); registerListener(plugin, new BoomBowDeathListener());
registerListener(plugin, new BoomBowListener(plugin)); registerListener(plugin, new BoomBowListener(plugin));
registerListener(plugin, new CannonBowListener()); registerListener(plugin, new CannonBowListener(plugin));
} }
} }

View file

@ -10,14 +10,18 @@ import org.bukkit.entity.Player;
import org.bukkit.entity.TNTPrimed; import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.ProjectileLaunchEvent; import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
public class CannonBowListener implements Listener { public class CannonBowListener implements Listener {
JavaPlugin plugin;
public CannonBowListener(){ public CannonBowListener(JavaPlugin plugin){
this.plugin = plugin;
} }
@SuppressWarnings("deprecation")
@EventHandler @EventHandler
public void onProjectileLaunch(ProjectileLaunchEvent event){ public void onProjectileLaunch(ProjectileLaunchEvent event){
if(event.getEntity().getType() != EntityType.ARROW) if(event.getEntity().getType() != EntityType.ARROW)
@ -46,8 +50,18 @@ public class CannonBowListener implements Listener {
player.getWorld().playSound(player.getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 0, 0); player.getWorld().playSound(player.getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 0, 0);
player.getWorld().playEffect(player.getLocation(), Effect.EXPLOSION, 1); player.getWorld().playEffect(player.getLocation(), Effect.EXPLOSION, 1);
arrow.remove(); arrow.remove();
return; return;
} }
@EventHandler
public void onTnTExplode(EntityExplodeEvent event) {
if (event.getEntityType() != EntityType.PRIMED_TNT)
return;
if (!event.getEntity().getCustomName().equals("CANNON BOW TNT"))
return;
event.setYield(0);
}
} }