From 9149cc565e66702cfb530bd2a48384db53e5648e Mon Sep 17 00:00:00 2001 From: Chiss Date: Mon, 2 Sep 2013 08:16:35 +1000 Subject: [PATCH] Hub turns off flight (people were staying in flying somehow) Spleef block damage fix Smash kit balances --- Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java | 10 ++++++++++ .../game/arcade/game/minigames/spleef/Spleef.java | 2 ++ .../game/arcade/game/standalone/smash/SuperSmash.java | 2 +- .../arcade/game/standalone/smash/kits/KitBlaze.java | 2 +- .../arcade/game/standalone/smash/kits/KitChicken.java | 2 +- .../arcade/game/standalone/smash/kits/KitSkeleton.java | 2 +- .../game/arcade/kit/perks/PerkChickenRocket.java | 2 +- .../src/nautilus/game/arcade/kit/perks/PerkEggGun.java | 2 +- .../nautilus/game/arcade/kit/perks/PerkFissure.java | 2 +- .../game/arcade/kit/perks/PerkSeismicSlam.java | 2 +- .../game/arcade/kit/perks/PerkSlimeRocket.java | 4 ++-- .../nautilus/game/arcade/kit/perks/PerkSlimeSlam.java | 2 +- 12 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index c50b57c1c..d549a5789 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -28,6 +28,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; +import org.bukkit.event.block.BlockSpreadEvent; import org.bukkit.event.block.LeavesDecayEvent; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityExplodeEvent; @@ -331,7 +332,10 @@ public class HubManager extends MiniClientPlugin continue; if (UtilEnt.isGrounded(player) || UtilBlock.solid(player.getLocation().getBlock().getRelative(BlockFace.DOWN))) + { player.setAllowFlight(true); + player.setFlying(false); + } } } @@ -583,4 +587,10 @@ public class HubManager extends MiniClientPlugin { event.blockList().clear(); } + + @EventHandler + public void VineGrow(BlockSpreadEvent event) + { + event.setCancelled(true); + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/Spleef.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/Spleef.java index ab70ebf15..0c6fe8b6e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/Spleef.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/Spleef.java @@ -111,6 +111,8 @@ public class Spleef extends SoloGame return; event.setCancelled(true); + + BlockFade(event.getBlock(), event.getPlayer()); } @EventHandler diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/SuperSmash.java index a288625aa..d39be4db0 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/SuperSmash.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/SuperSmash.java @@ -42,11 +42,11 @@ public class SuperSmash extends SoloGame new KitSkeleton(manager), new KitEnderman(manager), new KitBlaze(manager), - new KitChicken(manager), new KitGolem(manager), new KitSnowman(manager), //new KitSpider(manager), new KitSlime(manager), + new KitChicken(manager), }, new String[] diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitBlaze.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitBlaze.java index 2614a832f..27a43efe9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitBlaze.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitBlaze.java @@ -38,7 +38,7 @@ public class KitBlaze extends SmashKit new PerkDamageSet(7), new PerkKnockbackMultiplier(1.50), new PerkKnockbackFire(1.50), - new PerkSpeed(1), + new PerkSpeed(0), new PerkInferno(), new PerkFirefly(12000) }, diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java index 3ba3ec94c..a551223c4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java @@ -21,7 +21,7 @@ public class KitChicken extends SmashKit { public KitChicken(ArcadeManager manager) { - super(manager, "Chicken", KitAvailability.Free, + super(manager, "Chicken", KitAvailability.Blue, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java index ea06777fa..20658d1ee 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java @@ -38,7 +38,7 @@ public class KitSkeleton extends SmashKit new PerkFletcher(1, 2, false), new PerkKnockbackArrow(2), new PerkBoneExplosion(), - new PerkRopedArrow("Roped Arrow", 1, 4000), + new PerkRopedArrow("Roped Arrow", 1, 3000), //new PerkBarrage(5, 250, true), }, EntityType.SKELETON, diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkChickenRocket.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkChickenRocket.java index 34aad6d43..b395c7c48 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkChickenRocket.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkChickenRocket.java @@ -166,7 +166,7 @@ public class PerkChickenRocket extends Perk //Damage Event Manager.GetDamage().NewDamageEvent(livingEnt, data.Player, null, - DamageCause.PROJECTILE, 10, false, true, false, + DamageCause.PROJECTILE, 8, false, true, false, data.Player.getName(), GetName()); UtilAction.velocity(livingEnt, UtilAlg.getTrajectory2d(data.Chicken, livingEnt), 1.6, true, 0.8, 0, 10, true); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkEggGun.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkEggGun.java index e98e2d15c..121d1c714 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkEggGun.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkEggGun.java @@ -57,7 +57,7 @@ public class PerkEggGun extends Perk if (!Kit.HasKit(player)) return; - if (!Recharge.Instance.use(player, GetName(), 1500, true)) + if (!Recharge.Instance.use(player, GetName(), 2500, true)) return; _active.put(player, System.currentTimeMillis()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFissure.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFissure.java index 5e9881f2c..df3b64cd7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFissure.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFissure.java @@ -59,7 +59,7 @@ public class PerkFissure extends Perk return; } - if (!Recharge.Instance.use(player, GetName(), 1000, true)) + if (!Recharge.Instance.use(player, GetName(), 8000, true)) return; FissureData data = new FissureData(this, player, player.getLocation().getDirection(), player.getLocation().add(0, -0.5, 0)); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSeismicSlam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSeismicSlam.java index 019b934a2..578da537c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSeismicSlam.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSeismicSlam.java @@ -62,7 +62,7 @@ public class PerkSeismicSlam extends Perk if (!Kit.HasKit(player)) return; - if (!Recharge.Instance.use(player, GetName(), 1000, true)) + if (!Recharge.Instance.use(player, GetName(), 6000, true)) return; //Action diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSlimeRocket.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSlimeRocket.java index 1dc50ed83..75537564f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSlimeRocket.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSlimeRocket.java @@ -57,7 +57,7 @@ public class PerkSlimeRocket extends Perk implements IThrown if (player.isBlocking()) return; - player.setExp((float) Math.min(0.999, player.getExp()+0.0035)); + player.setExp((float) Math.min(0.999, player.getExp()+0.004)); } } @@ -239,7 +239,7 @@ public class PerkSlimeRocket extends Perk implements IThrown if (event.GetReason() == null || !event.GetReason().contains(GetName())) return; - event.AddKnockback(GetName(), 1.5); + event.AddKnockback(GetName(), 2.5); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSlimeSlam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSlimeSlam.java index bc31ffba5..c5bd14918 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSlimeSlam.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSlimeSlam.java @@ -112,7 +112,7 @@ public class PerkSlimeSlam extends Perk //Damage Event Manager.GetDamage().NewDamageEvent(damager, damagee, null, - DamageCause.CUSTOM, damage, true, true, false, + DamageCause.CUSTOM, damage/2d, true, true, false, damager.getName(), GetName() + " Recoil"); //Damage Event