From 5737df8d6aec4aeb641eab30ccbf79b097954ca0 Mon Sep 17 00:00:00 2001 From: Cheese Date: Wed, 1 Apr 2015 18:07:45 +1100 Subject: [PATCH] final fixes for bacon brawl --- .../game/games/baconbrawl/kits/KitMamaPig.java | 12 ++++-------- .../game/arcade/kit/perks/PerkBaconBlast.java | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitMamaPig.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitMamaPig.java index 6611d2d78..4852415a5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitMamaPig.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitMamaPig.java @@ -78,21 +78,17 @@ public class KitMamaPig extends Kit @EventHandler(priority=EventPriority.LOWEST) public void damageTransfer(CustomDamageEvent event) { - System.out.println("A"); if (event.IsCancelled()) return; - System.out.println("B"); + if (!(event.GetDamageeEntity() instanceof Pig)) return; - System.out.println("C"); + Pig pig = (Pig)event.GetDamageeEntity(); - if (pig.getVehicle() == null || !(pig.getPassenger() instanceof LivingEntity)) + if (pig.getVehicle() == null || !(pig.getVehicle() instanceof LivingEntity)) return; - System.out.println("D"); - event.SetCancelled("Pig Damage"); - Manager.GetDamage().NewDamageEvent((LivingEntity)pig.getVehicle(), event.GetDamagerEntity(true), event.GetProjectile(), event.GetCause(), - event.GetDamage(), event.IsKnockback(), event.IgnoreRate(), event.IgnoreArmor(), UtilEnt.getName(pig.getVehicle()), event.GetReason()); + event.setDamagee((LivingEntity)pig.getVehicle()); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBaconBlast.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBaconBlast.java index 1ff18356e..f61f6ede4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBaconBlast.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBaconBlast.java @@ -65,7 +65,7 @@ public class PerkBaconBlast extends Perk implements IThrown UtilInv.Update(player); - org.bukkit.entity.Item ent = player.getWorld().dropItem(player.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.PORK, (byte)0, 16)); + org.bukkit.entity.Item ent = player.getWorld().dropItem(player.getEyeLocation().add(player.getLocation().getDirection().multiply(1.5)), ItemStackFactory.Instance.CreateStack(Material.PORK, (byte)0, 16)); UtilAction.velocity(ent, player.getLocation().getDirection(), 1, false, 0, 0.2, 10, false);