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

BH Gem Fixes

Browse Source
This commit is contained in:
Chiss 2013-11-17 12:30:14 +11:00
parent 85a3edc75e
commit 0aae7d24ed
2 changed files with 70 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
View File

@ -20,7 +20,6 @@ import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType; import nautilus.game.arcade.GameType;
import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.events.PlayerStateChangeEvent; import nautilus.game.arcade.events.PlayerStateChangeEvent;
import nautilus.game.arcade.game.Game.GameState;
import nautilus.game.arcade.game.GameTeam.PlayerState; import nautilus.game.arcade.game.GameTeam.PlayerState;
import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.kit.KitAvailability; import nautilus.game.arcade.kit.KitAvailability;

54
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java
View File

@ -266,7 +266,7 @@ public class HideSeek extends TeamGame
ItemStack firework = ItemStackFactory.Instance.CreateStack(Material.FIREWORK, (byte)0, 5, C.cYellow + C.Bold + "Firework" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "+2 Gems"); ItemStack firework = ItemStackFactory.Instance.CreateStack(Material.FIREWORK, (byte)0, 5, C.cYellow + C.Bold + "Firework" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "+2 Gems");
FireworkMeta metaData = (FireworkMeta) firework.getItemMeta(); FireworkMeta metaData = (FireworkMeta) firework.getItemMeta();
metaData.setPower(1); metaData.setPower(1);
metaData.addEffect(FireworkEffect.builder().flicker(true).withColor(Color.AQUA).with(Type.BALL).trail(true).build()); metaData.addEffect(FireworkEffect.builder().flicker(true).withColor(Color.AQUA).with(Type.BALL_LARGE).trail(true).build());
firework.setItemMeta(metaData); firework.setItemMeta(metaData);
player.getInventory().setItem(5, firework); player.getInventory().setItem(5, firework);
@ -750,7 +750,7 @@ public class HideSeek extends TeamGame
{ {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (!UtilEvent.isAction(event, ActionType.R)) if (!UtilEvent.isAction(event, ActionType.R_BLOCK))
return; return;
if (!UtilGear.isMat(player.getItemInHand(), Material.FIREWORK)) if (!UtilGear.isMat(player.getItemInHand(), Material.FIREWORK))
@ -762,7 +762,7 @@ public class HideSeek extends TeamGame
return; return;
} }
this.AddGems(player, 4, "Fireworks", true); this.AddGems(player, 3, "Fireworks", true);
} }
@EventHandler @EventHandler
@ -776,7 +776,7 @@ public class HideSeek extends TeamGame
for (Player player : _hiders.GetPlayers(true)) for (Player player : _hiders.GetPlayers(true))
{ {
this.AddGems(player, 5d/60d, "Seconds Alive", true); this.AddGems(player, 0.05, "Seconds Alive", true);
} }
} }
@ -798,6 +798,39 @@ public class HideSeek extends TeamGame
} }
} }
@EventHandler
public void WaterDamage(UpdateEvent event)
{
if (!IsLive())
return;
if (event.getType() != UpdateType.FAST)
return;
}
@EventHandler
public void WorldWaterDamage(UpdateEvent event)
{
if (!IsLive())
return;
if (event.getType() != UpdateType.SEC)
return;
for (Player player : _hiders.GetPlayers(true))
if (player.getLocation().getBlock().getTypeId() == 8 || player.getLocation().getBlock().getTypeId() == 9)
{
//Damage Event
Manager.GetDamage().NewDamageEvent(player, null, null,
DamageCause.DROWNING, 1, false, false, false,
"Water", "Water Damage");
player.getWorld().playSound(player.getLocation(),
Sound.SPLASH, 0.8f,
1f + (float) Math.random() / 2);
}
}
@EventHandler @EventHandler
public void PlayerDeath(PlayerQuitEvent event) public void PlayerDeath(PlayerQuitEvent event)
{ {
@ -880,7 +913,18 @@ public class HideSeek extends TeamGame
@Override @Override
public double GetKillsGems(Player killer, Player killed, boolean assist) public double GetKillsGems(Player killer, Player killed, boolean assist)
{ {
return 4; if (_hiders.HasPlayer(killed))
{
if (!assist)
return 4;
else
return 1;
}
if (!assist)
return 1;
return 0;
} }
@EventHandler @EventHandler