From cee48f197869dc9213a09cbb50f39cf54dc9889c Mon Sep 17 00:00:00 2001 From: Chiss Date: Mon, 1 Dec 2014 19:33:36 +1100 Subject: [PATCH] made it so you can use fireworks without aiming against block in blockhunt removed fire from magma blast private blocks are no longer private if owner is dead --- .../src/nautilus/game/arcade/game/Game.java | 3 ++- .../arcade/game/games/hideseek/HideSeek.java | 18 +++++++++++++----- .../games/survivalgames/SurvivalGames.java | 5 +++++ .../game/arcade/kit/perks/PerkMagmaBlast.java | 2 +- .../game/arcade/managers/GameFlagManager.java | 11 ++++++++++- 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java index 9d463d7df..34419a37e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java @@ -181,7 +181,8 @@ public abstract class Game implements Listener public double DeathSpectateSecs = 0; public boolean QuitOut = true; - + public boolean QuitDropItems = false; + public boolean IdleKickz = true; public boolean CreatureAllow = false; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java index c776df703..16e899b96 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java @@ -49,6 +49,7 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.vehicle.VehicleExitEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.FireworkMeta; +import org.bukkit.util.Vector; import mineplex.core.common.util.C; import mineplex.core.common.util.F; @@ -59,6 +60,7 @@ import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilEnt; +import mineplex.core.common.util.UtilFirework; import mineplex.core.common.util.UtilGear; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilParticle; @@ -914,19 +916,25 @@ public class HideSeek extends TeamGame { Player player = event.getPlayer(); - if (!UtilEvent.isAction(event, ActionType.R_BLOCK)) + if (!UtilEvent.isAction(event, ActionType.R)) return; if (!UtilGear.isMat(player.getItemInHand(), Material.FIREWORK)) return; + event.setCancelled(true); + if (!Recharge.Instance.use(player, "Firework", 15000, true, true)) - { - event.setCancelled(true); return; - } - + this.AddGems(player, 2, "Fireworks", true); + + UtilInv.remove(player, Material.FIREWORK, (byte)0, 1); + UtilInv.Update(player); + + UtilFirework.launchFirework(player.getEyeLocation(), + FireworkEffect.builder().flicker(Math.random() > 0.5).withColor(Color.YELLOW).with(Type.BALL_LARGE).trail(true).flicker(true).build(), + new Vector(0,0,0), 2); } @EventHandler diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java index fdab03d9d..3e5b87c83 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java @@ -33,6 +33,7 @@ import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; +import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.util.Vector; import mineplex.core.common.util.C; @@ -157,6 +158,8 @@ public class SurvivalGames extends SoloGame this.GameTimeout = 9600000; + this.QuitDropItems = true; + this.WorldTimeSet = 0; this.WorldBoundaryKill = false; @@ -1698,4 +1701,6 @@ public class SurvivalGames extends SoloGame if (isDeathMatchAboutToStart()) event.getProjectile().remove(); } + + } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMagmaBlast.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMagmaBlast.java index 98f79a532..ac029b66d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMagmaBlast.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMagmaBlast.java @@ -139,7 +139,7 @@ public class PerkMagmaBlast extends Perk 1 + 2 * range, false, 0, 0.2 + 0.4 * range, 1.2, true); //Ignite - Manager.GetCondition().Factory().Ignite(GetName(), cur, (Player)proj.getShooter(), 4, false, false); + //Manager.GetCondition().Factory().Ignite(GetName(), cur, (Player)proj.getShooter(), 4, false, false); } //Particles diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java index faa81da69..f6f90201f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java @@ -556,6 +556,10 @@ public class GameFlagManager implements Listener return; Player owner = game.PrivateBlockMap.get(event.getClickedBlock().getLocation()); + + if (!game.IsAlive(owner)) + return; + Player player = event.getPlayer(); if (owner.equals(player)) @@ -721,6 +725,11 @@ public class GameFlagManager implements Listener Game game = Manager.GetGame(); if (game == null) return; + //Drop Items + if (game.QuitDropItems) + if (game.IsAlive(event.getPlayer())) + UtilInv.drop(event.getPlayer(), true); + //Remove Kit game.RemoveTeamPreference(event.getPlayer()); game.GetPlayerKits().remove(event.getPlayer()); @@ -740,7 +749,7 @@ public class GameFlagManager implements Listener } } - + @EventHandler public void PlayerMoveCancel(PlayerMoveEvent event) {