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

Fixed a little boolean derp that stopped people from breaking blocks.

Browse Source 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 1f0accd)
This commit is contained in:
Aaron Brock 2015-06-20 01:09:21 -04:00 committed by Shaun Bennett
parent 9df297fc11
commit 8dd80094b4
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java
View File

@ -112,7 +112,6 @@ public class TurfForts extends TeamGame
new Kit[] new Kit[]
{ {
new KitMarksman(manager), new KitMarksman(manager),
new KitInfiltrator(manager), new KitInfiltrator(manager),
new KitShredder(manager), new KitShredder(manager),
@ -124,7 +123,6 @@ public class TurfForts extends TeamGame
"", "",
"Each kill advances your turf forwards.", "Each kill advances your turf forwards.",
"Take over all the turf to win!" "Take over all the turf to win!"
}); });
this.StrictAntiHack = true; this.StrictAntiHack = true;
@ -718,14 +716,13 @@ public class TurfForts extends TeamGame
GameTeam team = GetTeam(event.getPlayer()); GameTeam team = GetTeam(event.getPlayer());
GameTeam otherTeam = GetOtherTeam(team); GameTeam otherTeam = GetOtherTeam(team);
if (block.getType().equals(Material.WOOL) && (block.getData() == 14 && team.GetColor() != ChatColor.RED || block.getData() == 3 || team.GetColor() != ChatColor.AQUA)) if (block.getType().equals(Material.WOOL) && (block.getData() == 14 && team.GetColor() != ChatColor.RED) || (block.getData() == 3 && team.GetColor() != ChatColor.AQUA))
{ {
UtilPlayer.message(event.getPlayer(), F.main("Game", "You cannot break the " + F.elem(otherTeam.GetColor() + otherTeam.GetName()) + " team's blocks!")); UtilPlayer.message(event.getPlayer(), F.main("Game", "You cannot break the " + F.elem(otherTeam.GetColor() + otherTeam.GetName()) + " team's blocks!"));
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
} }
public GameTeam GetOtherTeam(GameTeam team) { public GameTeam GetOtherTeam(GameTeam team) {