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

cannot shoot arrow in water.

Browse Source 
less gems for capping
This commit is contained in:
Chiss 2014-04-21 17:14:23 +10:00
parent 62c245d728
commit 0f31052d00
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
View File

@ -1,5 +1,7 @@
package nautilus.game.arcade.game.games.champions; 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 mineplex.minecraft.game.core.combat.DeathMessageType;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType; import nautilus.game.arcade.GameType;
@ -13,6 +15,8 @@ import nautilus.game.arcade.game.games.common.Domination;
import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.Kit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityShootBowEvent;
public class ChampionsDominate extends Domination public class ChampionsDominate extends Domination
{ {
@ -63,4 +67,14 @@ public class ChampionsDominate extends Domination
{ {
return DeathMessageType.Detailed; 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);
}
}
} }

12
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java
View File

@ -6,10 +6,12 @@ import java.util.HashMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityShootBowEvent;
import org.bukkit.scoreboard.DisplaySlot; import org.bukkit.scoreboard.DisplaySlot;
import org.bukkit.scoreboard.Objective; import org.bukkit.scoreboard.Objective;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilServer;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
@ -203,4 +205,14 @@ public class ChampionsTDM extends TeamGame
for (Player player : GetPlayers(true)) for (Player player : GetPlayers(true))
_healthObj.getScore(player).setScore((int)player.getHealth()); _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);
}
}
} }

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/dominate_data/CapturePoint.java
View File

@ -298,7 +298,7 @@ public class CapturePoint
{ {
for (Player player : capturers) 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; Host.GetStats(player).CaptureScore += 30;
} }
@ -356,7 +356,7 @@ public class CapturePoint
{ {
for (Player player : capturers) 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; Host.GetStats(player).CaptureScore += 1;
} }
} }