Fixed Bugs

This commit is contained in:
Chiss 2015-01-30 16:08:22 +11:00
parent 3fdf914d63
commit c066cb5185

View File

@ -50,7 +50,7 @@ public class PerkDeadlyBones extends SmashPerk
if (!Kit.HasKit(player))
return;
if (!Recharge.Instance.use(player, GetName(), 400, true, true))
if (!Recharge.Instance.use(player, GetName(), 400, false, false))
return;
_active.put(player.getWorld().dropItemNaturally(player.getLocation().add(0, 0.5, 0),
@ -70,7 +70,7 @@ public class PerkDeadlyBones extends SmashPerk
Item item = itemIter.next();
//Not Ready
if (item.isValid() && item.getTicksLived() < 60)
if (item.isValid() && item.getTicksLived() < 50)
continue;
//Effect
@ -80,14 +80,14 @@ public class PerkDeadlyBones extends SmashPerk
Player player = _active.get(item);
//Damage
HashMap<LivingEntity, Double> targets = UtilEnt.getInRadius(player.getLocation(), 4);
HashMap<LivingEntity, Double> targets = UtilEnt.getInRadius(item.getLocation(), 4);
for (LivingEntity cur : targets.keySet())
{
if (cur.equals(player))
continue;
Manager.GetDamage().NewDamageEvent(cur, player, null,
DamageCause.CUSTOM, 4 * targets.get(cur) + 0.5, true, true, false,
DamageCause.CUSTOM, 4 * targets.get(cur) + 1, true, true, false,
player.getName(), GetName());
}