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

Fix Evo and SG

Browse Source
This commit is contained in:
Sam 2018-07-20 00:12:16 +01:00 committed by Alexander Meech
parent b407f4ed8a
commit 77fee0f567
6 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
View File

@ -342,7 +342,7 @@ public class SetCommand extends CommandBase<ArcadeManager>
@Override @Override
public List<String> onTabComplete(CommandSender sender, String commandLabel, String[] args) public List<String> onTabComplete(CommandSender sender, String commandLabel, String[] args)
{ {
if (!(sender instanceof Player) || !_commandCenter.GetClientManager().Get((Player) sender).hasPermission(getPermission())) if (!(sender instanceof Player) || !Plugin.canPlayerUseGameCmd((Player) sender))
{ {
return null; return null;
} }

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

@ -245,7 +245,6 @@ public abstract class Game extends ListenerComponent implements Lifetimed
public boolean DeathOut = true; public boolean DeathOut = true;
public boolean DeathDropItems = false; public boolean DeathDropItems = false;
public boolean DeathMessages = true; public boolean DeathMessages = true;
public boolean AutomaticRespawn = true;
public double DeathSpectateSecs = 0; public double DeathSpectateSecs = 0;
public boolean DeathTeleport = true; public boolean DeathTeleport = true;

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

@ -149,7 +149,6 @@ public class Evolution extends SoloGame
.setGiveCompass(false) .setGiveCompass(false)
.register(this); .register(this);
AutomaticRespawn = false;
DeathSpectateSecs = 4.0; DeathSpectateSecs = 4.0;
CreatureAllow = false; CreatureAllow = false;

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

@ -253,7 +253,6 @@ public class BawkBawkBattles extends TeamGame implements IThrown
DeathOut = false; DeathOut = false;
DeathTeleport = false; DeathTeleport = false;
AutomaticRespawn = false;
DeathMessages = false; DeathMessages = false;
FixSpawnFacing = false; FixSpawnFacing = false;

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

@ -37,7 +37,6 @@ public class SurvivalGamesNewTeams extends SurvivalGamesNew
_teamSelector = new FillToSelector(this, 2); _teamSelector = new FillToSelector(this, 2);
new NamedTeamsModule() new NamedTeamsModule()
.setTeamPerSpawn(true)
.register(this); .register(this);
new TeamRequestsModule() new TeamRequestsModule()

14
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
View File

@ -782,11 +782,7 @@ public class GameFlagManager implements Listener
// Respawn Now // Respawn Now
if (respawnTime <= 0) if (respawnTime <= 0)
{ {
// Auto handle respawning game.RespawnPlayer(player);
if (game.AutomaticRespawn)
{
game.RespawnPlayer(player);
}
Manager.runSyncLater(() -> Manager.runSyncLater(() ->
{ {
@ -844,11 +840,9 @@ public class GameFlagManager implements Listener
{ {
Manager.addSpectator(player, game.DeathTeleport); Manager.addSpectator(player, game.DeathTeleport);
} }
else if (game.AutomaticRespawn)
{ game.RespawnPlayer(player);
game.RespawnPlayer(player); UtilTextBottom.display(C.cGreenB + "Respawned", player);
UtilTextBottom.display(C.cGreenB + "Respawned", player);
}
} }
else else
{ {