diff --git a/.gitignore b/.gitignore index faa4d8cb7..3ab1e007b 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,6 @@ Reference BungeeCord /Plugins/Mineplex.Bungee.Mineplexer/*.gitignore Reference_1_7 +Website/LOC.Website.Web/obj/Debug Servers +Debug diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java index be5cf2111..9b2cc93d1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java @@ -52,8 +52,8 @@ public class ChampionsDominate extends Domination Manager.GetDamage().UseSimpleWeaponDamage = false; - //EloRanking = true; - //EloStart = 1000; + EloRanking = true; + EloStart = 1000; } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java index bc66d3827..ba8ea7a5c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java @@ -53,7 +53,7 @@ public class Domination extends TeamGame private ArrayList _lastScoreboard = new ArrayList(); //Scores - private int _victoryScore = 15000; + private int _victoryScore = 1000; private int _redScore = 0; private int _blueScore = 0; diff --git a/Website/LOC.Core/Tokens/AccountBatchToken.cs b/Website/LOC.Core/Tokens/AccountBatchToken.cs new file mode 100644 index 000000000..c14e4da6f --- /dev/null +++ b/Website/LOC.Core/Tokens/AccountBatchToken.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace LOC.Core.Tokens +{ + public class AccountBatchToken + { + public int Start { get; set; } + + public int End { get; set; } + } +} diff --git a/Website/LOC.Core/Tokens/AccountNameToken.cs b/Website/LOC.Core/Tokens/AccountNameToken.cs new file mode 100644 index 000000000..a31831fed --- /dev/null +++ b/Website/LOC.Core/Tokens/AccountNameToken.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace LOC.Core.Tokens +{ + public class AccountNameToken + { + public string Name { get; set; } + + public string UUID { get; set; } + } +} diff --git a/Website/LOC.Website.Web/Controllers/DependencyResolution/IoC.cs b/Website/LOC.Website.Web/Controllers/DependencyResolution/IoC.cs new file mode 100644 index 000000000..ffb76364e --- /dev/null +++ b/Website/LOC.Website.Web/Controllers/DependencyResolution/IoC.cs @@ -0,0 +1,19 @@ +namespace LOC.Website.Web.DependencyResolution +{ + using StructureMap; + + public static class IoC { + public static IContainer Initialize() + { + ObjectFactory.Initialize( + x => x.Scan( + scan => + { + scan.TheCallingAssembly(); + scan.AssembliesFromApplicationBaseDirectory(); + scan.WithDefaultConventions(); + })); + return ObjectFactory.Container; + } + } +} \ No newline at end of file diff --git a/Website/LOC.Website.Web/Controllers/DependencyResolution/SmDependencyResolver.cs b/Website/LOC.Website.Web/Controllers/DependencyResolution/SmDependencyResolver.cs new file mode 100644 index 000000000..f1f86b7b7 --- /dev/null +++ b/Website/LOC.Website.Web/Controllers/DependencyResolution/SmDependencyResolver.cs @@ -0,0 +1,34 @@ +namespace LOC.Website.Web.DependencyResolution +{ + using StructureMap; + using System; + using System.Collections.Generic; + using System.Linq; + using System.Web.Mvc; + + public class SmDependencyResolver : IDependencyResolver { + + private readonly IContainer _container; + + public SmDependencyResolver(IContainer container) { + _container = container; + } + + public object GetService(Type serviceType) { + if (serviceType == null) return null; + try { + return serviceType.IsAbstract || serviceType.IsInterface + ? _container.TryGetInstance(serviceType) + : _container.GetInstance(serviceType); + } + catch { + + return null; + } + } + + public IEnumerable GetServices(Type serviceType) { + return _container.GetAllInstances(serviceType).Cast(); + } + } +} \ No newline at end of file