From 0f31052d007b65f575c04133d3915581e2ddc02c Mon Sep 17 00:00:00 2001 From: Chiss Date: Mon, 21 Apr 2014 17:14:23 +1000 Subject: [PATCH] cannot shoot arrow in water. less gems for capping --- .../game/games/champions/ChampionsDominate.java | 14 ++++++++++++++ .../arcade/game/games/champions/ChampionsTDM.java | 12 ++++++++++++ .../games/common/dominate_data/CapturePoint.java | 4 ++-- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java index fea347c18..8f9314aed 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java @@ -1,5 +1,7 @@ package nautilus.game.arcade.game.games.champions; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; import mineplex.minecraft.game.core.combat.DeathMessageType; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; @@ -13,6 +15,8 @@ import nautilus.game.arcade.game.games.common.Domination; import nautilus.game.arcade.kit.Kit; import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityShootBowEvent; public class ChampionsDominate extends Domination { @@ -63,4 +67,14 @@ public class ChampionsDominate extends Domination { return DeathMessageType.Detailed; } + + @EventHandler + public void WaterArrowCancel(EntityShootBowEvent event) + { + if (event.getEntity().getLocation().getBlock().isLiquid()) + { + UtilPlayer.message(event.getEntity(), F.main("Game", "You cannot use your Bow while swimming.")); + event.setCancelled(true); + } + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java index 86300cdb1..fc65d61c1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java @@ -6,10 +6,12 @@ import java.util.HashMap; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityShootBowEvent; import org.bukkit.scoreboard.DisplaySlot; import org.bukkit.scoreboard.Objective; import mineplex.core.common.util.C; +import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; import mineplex.core.updater.UpdateType; @@ -203,4 +205,14 @@ public class ChampionsTDM extends TeamGame for (Player player : GetPlayers(true)) _healthObj.getScore(player).setScore((int)player.getHealth()); } + + @EventHandler + public void WaterArrowCancel(EntityShootBowEvent event) + { + if (event.getEntity().getLocation().getBlock().isLiquid()) + { + UtilPlayer.message(event.getEntity(), F.main("Game", "You cannot use your Bow while swimming.")); + event.setCancelled(true); + } + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/dominate_data/CapturePoint.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/dominate_data/CapturePoint.java index 3e8782cea..84fdfdedf 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/dominate_data/CapturePoint.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/dominate_data/CapturePoint.java @@ -298,7 +298,7 @@ public class CapturePoint { for (Player player : capturers) { - Host.AddGems(player, 3, "Control Point Score", true); + Host.AddGems(player, 0.6, "Control Point Score", true); Host.GetStats(player).CaptureScore += 30; } @@ -356,7 +356,7 @@ public class CapturePoint { for (Player player : capturers) { - Host.AddGems(player, 0.1, "Control Point Score", true); + Host.AddGems(player, 0.02, "Control Point Score", true); Host.GetStats(player).CaptureScore += 1; } }