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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Browse Source
This commit is contained in:
Cheese 2015-11-24 15:23:53 +11:00
commit 913d079623
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
View File

@ -273,8 +273,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
return; return;
} }
_maxY = GetTeamList().get(1).GetSpawn().getBlockY() - 4; if(event.getBlock().getLocation().getBlockY() < _maxY - 4)
if(event.getBlock().getLocation().getBlockY() < _maxY)
{ {
event.getPlayer().sendMessage(F.main("BlockChecker", "You may not build under this height!")); event.getPlayer().sendMessage(F.main("BlockChecker", "You may not build under this height!"));
event.setCancelled(true); event.setCancelled(true);
@ -298,7 +297,6 @@ public class WitherGame extends TeamGame implements IBlockRestorer
} }
Location blockLocation = event.getBlock().getLocation(); Location blockLocation = event.getBlock().getLocation();
_maxY = GetTeamList().get(1).GetSpawn().getBlockY() - 3;
if(blockLocation.add(0,1,0).getBlock().getType() == Material.AIR) if(blockLocation.add(0,1,0).getBlock().getType() == Material.AIR)
{ {
for(Player humans: _runners.GetPlayers(true)) for(Player humans: _runners.GetPlayers(true))
@ -317,7 +315,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
} }
} }
if(blockLocation.getBlockY() < _maxY) if(blockLocation.getBlockY() < _maxY - 3)
{ {
event.getPlayer().sendMessage(F.main("BlockChecker", "You may not build under this height!")); event.getPlayer().sendMessage(F.main("BlockChecker", "You may not build under this height!"));
event.setCancelled(true); event.setCancelled(true);
@ -435,6 +433,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
if (event.GetState() != GameState.Live) if (event.GetState() != GameState.Live)
return; return;
_maxY = GetTeamList().get(1).GetSpawn().getBlockY();
UtilTextMiddle.display(C.cGreen + "Humans Hiding", UtilTextMiddle.display(C.cGreen + "Humans Hiding",
"15 Seconds until Assault", 10, 80, 10); "15 Seconds until Assault", 10, 80, 10);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlockRestorer.java
View File

@ -60,7 +60,7 @@ public class PerkBlockRestorer extends Perk implements IThrown
org.bukkit.entity.Item ent = player.getWorld().dropItem(player.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.COMMAND)); org.bukkit.entity.Item ent = player.getWorld().dropItem(player.getEyeLocation(), ItemStackFactory.Instance.CreateStack(Material.COMMAND));
UtilAction.velocity(ent, player.getLocation().getDirection(), 1.2, false, 0, 0.2, 10, false); UtilAction.velocity(ent, player.getLocation().getDirection(), 1.2, false, 0, 0.2, 10, false);
Manager.GetProjectile().AddThrow(ent, player, this, -1, false, false, true, false, 0.5f); Manager.GetProjectile().AddThrow(ent, player, this, -1, false, false, true, true, 0.5f);
} }
@Override @Override