another git fix

This commit is contained in:
Sarah 2015-07-17 06:30:53 +02:00
parent aaae11d426
commit 02a71bff68
4 changed files with 1648 additions and 4 deletions

View File

@ -115,7 +115,6 @@ public enum GameType
WitherAssault(WitherGame.class, GameDisplay.WitherAssault),
Wizards(Wizards.class, GameDisplay.Barbarians.Wizards, "http://chivebox.com/file/c/ResWizards.zip", true),
ZombieSurvival(ZombieSurvival.class, GameDisplay.ZombieSurvival),
Build(Build.class, GameDisplay.Build),
Cards(Cards.class, GameDisplay.Cards),
Skywars(SoloSkywars.class, GameDisplay.Skywars),
@ -128,9 +127,9 @@ public enum GameType
GameType.Draw, GameType.Evolution, GameType.Gravity, GameType.Halloween, GameType.HideSeek,
GameType.HoleInTheWall, GameType.Horse, GameType.Micro, GameType.MilkCow, GameType.MineStrike, GameType.MineWare,
GameType.OldMineWare, GameType.Paintball, GameType.Quiver, GameType.QuiverTeams, GameType.Runner, GameType.SearchAndDestroy,
GameType.Sheep, GameType.Skywars, /*GameType.SkywarsTeams,*/ GameType.Smash, GameType.SmashDomination, /*GameType.SmashTeams,*/
GameType.Sheep, GameType.Skywars, GameType.SkywarsTeams, GameType.Smash, GameType.SmashDomination, GameType.SmashTeams,
GameType.Snake, GameType.SneakyAssassins, GameType.SnowFight, GameType.Spleef, GameType.SpleefTeams, GameType.SquidShooter,
GameType.Stacker, GameType.SurvivalGames, /*GameType.SurvivalGamesTeams,*/ GameType.Tug, GameType.TurfWars, GameType.UHC,
GameType.Stacker, GameType.SurvivalGames, GameType.SurvivalGamesTeams, GameType.Tug, GameType.TurfWars, GameType.UHC,
GameType.WitherAssault, GameType.Wizards, GameType.ZombieSurvival}, true);
GameDisplay _display;

View File

@ -156,7 +156,7 @@ public abstract class Skywars extends Game
WorldTimeSet = 0;
WorldBoundaryKill = false;
SpawnNearAllies = true;
DamageSelf = true;

View File

@ -38,6 +38,7 @@ public class GameCreationManager implements Listener
public String MapSource = null;
public String MapPref = null;
public String MapSource = null;
public GameCreationManager(ArcadeManager manager)
{