Merge pull request #403 from OmniCypher-/master

Fixes Dynamic digging depth & EarthSmash grab distance
This commit is contained in:
OmniCypher 2016-02-15 16:47:23 -08:00
commit a7b8dad7aa
3 changed files with 4 additions and 4 deletions

View file

@ -346,7 +346,7 @@ public abstract class EarthAbility extends ElementalAbility {
int rotation = 30;
for (int i = 0; i < radius; i++) {
Vector tracer = new Vector(i, 0, 0);
Vector tracer = new Vector(i, 1, 0);
for (int deg = 0; deg < 360; deg += rotation) {
Location searchLoc = loc.clone().add(tracer);
Block block = GeneralMethods.getTopBlock(searchLoc, maxVertical);

View file

@ -677,8 +677,8 @@ public class ConfigManager {
config.addDefault("Abilities.Earth.EarthSmash.ShootAnimationInterval", 25);
config.addDefault("Abilities.Earth.EarthSmash.FlightAnimationInterval", 0);
config.addDefault("Abilities.Earth.EarthSmash.LiftAnimationInterval", 30);
config.addDefault("Abilities.Earth.EarthSmash.GrabDetectionRadius", 3.5);
config.addDefault("Abilities.Earth.EarthSmash.FlightDetectionRadius", 3.8);
config.addDefault("Abilities.Earth.EarthSmash.GrabDetectionRadius", 2.5);
config.addDefault("Abilities.Earth.EarthSmash.FlightDetectionRadius", 3.5);
config.addDefault("Abilities.Earth.MetalClips.Enabled", true);
config.addDefault("Abilities.Earth.MetalClips.Description", "MetalClips has the potential to be both an offensive and a utility ability. To start, you must carry smelted Iron Ingots in your inventory. To apply the clips onto an entity, simply click at them. If the entity is a Zombie, a Skeleton, or a Player, the clips will form armor around the entity, giving you some control over them. Each additional clip will give you more control. If you have permission to do so, you may crush the entity against a wall with a 4th clip, hurting them. Without explicit permissions, you will only be able to strap three clips on your target. If the entity is not one of the above, the clip will simply do damage and fall to the ground, to be collected. Another permission requiring action is throwing entities. To do so, click while controlling a metalclipped entity");

View file

@ -294,7 +294,7 @@ public class BlockSource {
}
Location loc = tempBlock.getLocation();
sourceBlock = EarthAbility.getNearbyEarthBlock(loc, 3, 3);
sourceBlock = EarthAbility.getNearbyEarthBlock(loc, 3, 1);
if (sourceBlock == null || !sourceBlock.getLocation().getWorld().equals(player.getWorld()) || Math.abs(sourceBlock.getLocation().distance(player.getEyeLocation())) > range || !EarthAbility.isEarthbendable(player, sourceBlock)) {
return null;
}