JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Brute/BlockToss] Change recharge time and remove redundant null check. [PC-338]

Browse Source
This commit is contained in:
Ben 2016-05-22 20:51:22 +01:00
parent e701e0c0db
commit ceab00f979
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
View File

@ -199,14 +199,14 @@ public class BlockToss extends SkillCharge implements IThrown
@EventHandler
public void Damage(EntityDamageByEntityEvent event)
{
Entity entity = event.getEntity();
Entity vehicle = event.getEntity().getVehicle();
if (entity.getVehicle() != null && _holding.containsKey(entity.getVehicle()))
if (_holding.containsKey(vehicle))
{
Player attacker = (Player) event.getDamager();
//Forward Damage
Factory.Damage().NewDamageEvent((Player) entity.getVehicle(), attacker, Factory.Damage().GetProjectile(event),
Factory.Damage().NewDamageEvent((Player) vehicle, attacker, Factory.Damage().GetProjectile(event),
event.getCause(), event.getDamage(), true, false, false, null, null, event.isCancelled());
}
}
@ -258,7 +258,7 @@ public class BlockToss extends SkillCharge implements IThrown
for (Player cur : throwSet)
{
Recharge.Instance.recharge(cur, GetName());
Recharge.Instance.use(cur, GetName(), 4000 - (500 * getLevel(cur)), false, true);
Recharge.Instance.use(cur, GetName(), 5500 - (500 * getLevel(cur)), false, true);
FallingBlock block = _holding.remove(cur);
float charge = _charge.remove(cur);