From 5484d564c2aeb69d72372a1e86f0a5399f360783 Mon Sep 17 00:00:00 2001 From: ImproperIssues Date: Thu, 6 Jul 2023 13:57:34 -0700 Subject: [PATCH] added tazer --- .../custom/items/customitems/TazerItem.java | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/main/java/fun/ogre/ogredupealias/plugin/custom/items/customitems/TazerItem.java b/src/main/java/fun/ogre/ogredupealias/plugin/custom/items/customitems/TazerItem.java index cfef9e9..bb586da 100644 --- a/src/main/java/fun/ogre/ogredupealias/plugin/custom/items/customitems/TazerItem.java +++ b/src/main/java/fun/ogre/ogredupealias/plugin/custom/items/customitems/TazerItem.java @@ -14,6 +14,7 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.util.Vector; +import java.util.function.Consumer; import java.util.function.Predicate; public class TazerItem extends CustomItem { @@ -30,12 +31,7 @@ public class TazerItem extends CustomItem { Location loc = player.getEyeLocation(); Vector vec = player.getLocation().getDirection().normalize(); Predicate filter = (e) -> e != player && !e.isDead() && e instanceof LivingEntity; - - Location target = RaycastUtils.raycast(loc, vec, 64.0, point -> { - boolean hitBlock = !point.getBlock().isPassable(); - boolean hitEntity = point.getWorld().getNearbyEntities(point, 2, 2, 2).stream().anyMatch(filter); - return hitBlock || hitEntity; - }); + Location target = RaycastUtils.raycast(loc, vec, 64.0, point -> !point.getBlock().isPassable()); int maxSections = 10; int delta = 5; double maxDist = loc.distance(target); @@ -47,21 +43,22 @@ public class TazerItem extends CustomItem { point.getWorld().spawnParticle(Particle.REDSTONE, point, 1, 0, 0, 0, 0, dust); return false; }; + Consumer onHit = (entity) -> { + ((LivingEntity) entity).damage(6, entity); // let the entity kill themselves for max trolldge + entity.setFireTicks(100); + SoundPlayer hit = new SoundPlayer(entity.getLocation(), Sound.BLOCK_LAVA_EXTINGUISH, 1, 1.5F); + hit.playWithin(20); + }; for (int i = 0; i < maxSections - 1; i ++) { prevLoc = RaycastUtils.raycast(prevLoc, vec, sectionDist, 0.2, hitCondition); vec = randomizeVector(vec, delta); - SoundPlayer zap = new SoundPlayer(prevLoc, Sound.ENTITY_BEE_HURT, 1, 10); zap.playWithin(20); - prevLoc.getWorld().getNearbyEntities(prevLoc, 2, 2, 2).stream().filter(filter).forEach(entity -> { - ((LivingEntity) entity).damage(6, player); - entity.setFireTicks(100); - SoundPlayer hit = new SoundPlayer(entity.getLocation(), Sound.BLOCK_LAVA_EXTINGUISH, 1, 1.5F); - hit.playWithin(20); - }); + prevLoc.getWorld().getNearbyEntities(prevLoc, 2, 2, 2).stream().filter(filter).forEach(onHit); } - RaycastUtils.raycast(prevLoc, target, 0.2, hitCondition); + prevLoc = RaycastUtils.raycast(prevLoc, target, 0.2, hitCondition); + prevLoc.getWorld().getNearbyEntities(prevLoc, 2, 2, 2).stream().filter(filter).forEach(onHit); }; }