diff --git a/Plugins/BuildFiles/common.xml b/Plugins/BuildFiles/common.xml index 51870c86b..4c3d6b432 100644 --- a/Plugins/BuildFiles/common.xml +++ b/Plugins/BuildFiles/common.xml @@ -377,10 +377,7 @@ - - - - + diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCount.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCount.java index 9a5f2fb5e..d5c950a23 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCount.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCount.java @@ -9,6 +9,7 @@ import mineplex.serverdata.Region; import mineplex.serverdata.data.BungeeServer; import mineplex.serverdata.data.DataRepository; import mineplex.serverdata.redis.RedisDataRepository; +import mineplex.serverdata.servers.ConnectionData; import mineplex.serverdata.servers.ServerManager; import mineplex.serverdata.servers.ServerRepository; import net.md_5.bungee.api.ServerPing.Players; @@ -21,6 +22,7 @@ import net.md_5.bungee.event.EventHandler; public class PlayerCount implements Listener, Runnable { private DataRepository _repository; + private DataRepository _secondRepository; private UUID _uuid; private Region _region; @@ -42,11 +44,17 @@ public class PlayerCount implements Listener, Runnable _repository = new RedisDataRepository(ServerManager.getMasterConnection(), ServerManager.getSlaveConnection(), Region.ALL, BungeeServer.class, "bungeeServers"); + + if (_region == Region.US) + _secondRepository = new RedisDataRepository(new ConnectionData("10.81.1.156", 6379), new ConnectionData("10.81.1.156", 6377), + Region.ALL, BungeeServer.class, "bungeeServers"); + else + _secondRepository = new RedisDataRepository(new ConnectionData("10.33.53.16", 6379), new ConnectionData("10.33.53.16", 6377), + Region.ALL, BungeeServer.class, "bungeeServers"); } public void run() { - BungeeServer snapshot = generateSnapshot(); _repository.addElement(snapshot, 15); // Update with a 15 second expiry on session @@ -64,6 +72,11 @@ public class PlayerCount implements Listener, Runnable totalPlayers += server.getPlayerCount(); } + for (BungeeServer server : _secondRepository.getElements()) + { + totalPlayers += server.getPlayerCount(); + } + return totalPlayers; } diff --git a/Plugins/Mineplex.BungeeRotator/src/mineplex/bungee/BungeeRotator.java b/Plugins/Mineplex.BungeeRotator/src/mineplex/bungee/BungeeRotator.java index add5fd42b..b37cdf486 100644 --- a/Plugins/Mineplex.BungeeRotator/src/mineplex/bungee/BungeeRotator.java +++ b/Plugins/Mineplex.BungeeRotator/src/mineplex/bungee/BungeeRotator.java @@ -4,7 +4,6 @@ import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashSet; @@ -14,14 +13,6 @@ import java.util.logging.Formatter; import java.util.logging.LogRecord; import java.util.logging.Logger; -import org.apache.commons.lang.RandomStringUtils; - -import biz.neustar.ultra.client.UltraAPIClient; -import biz.neustar.ultra.client.UltraAPIClientImpl; -import biz.neustar.ultra.client.UltraAPIException; - -import com.neustar.ultraservice.schema.v01.AccountDetailsList; - import mineplex.bungee.api.ApiDeleteCall; import mineplex.bungee.api.ApiGetCall; import mineplex.bungee.api.ApiPostCall; @@ -33,11 +24,13 @@ import mineplex.serverdata.Region; import mineplex.serverdata.data.BungeeServer; import mineplex.serverdata.data.DataRepository; import mineplex.serverdata.redis.RedisDataRepository; +import mineplex.serverdata.servers.ConnectionData; import mineplex.serverdata.servers.ServerManager; public class BungeeRotator { private static DataRepository _repository; + private static DataRepository _secondRepository; private static PlayerStatsRepository _ipRepository; //private static ServerRepository _repository = null; @@ -76,6 +69,7 @@ public class BungeeRotator } + /* String username = "mineplex"; String password = "gjxcVf%nk."; String accountId = null; @@ -105,13 +99,16 @@ public class BungeeRotator e.printStackTrace(); } - /* + */ _debug = new File("debug.dat").exists(); _repository = new RedisDataRepository(ServerManager.getMasterConnection(), ServerManager.getSlaveConnection(), Region.ALL, BungeeServer.class, "bungeeServers"); - _ipRepository = new PlayerStatsRepository(); + _secondRepository = new RedisDataRepository(new ConnectionData("10.81.1.156", 6379), new ConnectionData("10.81.1.156", 6377), + Region.ALL, BungeeServer.class, "bungeeServers"); + + //_ipRepository = new PlayerStatsRepository(); BungeeSorter bungeeSorter = new BungeeSorter(); int maxRecordCount = 10; @@ -121,6 +118,8 @@ public class BungeeRotator try { List bungeeServers = new ArrayList(_repository.getElements()); + bungeeServers.addAll(_secondRepository.getElements()); + Collections.sort(bungeeServers, bungeeSorter); if (_debug) @@ -249,6 +248,7 @@ public class BungeeRotator } } + /* List updatedAddresses = new ArrayList(1000); for (IpInfo ipInfo : _ipRepository.getIpAddresses()) @@ -269,7 +269,7 @@ public class BungeeRotator } _ipRepository.updateIps(updatedAddresses); - + */ try { Thread.sleep(15000); @@ -279,6 +279,7 @@ public class BungeeRotator { e.printStackTrace(); } + } catch (Exception ex) { @@ -295,7 +296,6 @@ public class BungeeRotator } } } - */ } private static void log(String message) diff --git a/Plugins/Mineplex.ChestConverter/src/mineplex/chestConverter/ChestConverter.java b/Plugins/Mineplex.ChestConverter/src/mineplex/chestConverter/ChestConverter.java index ed9388f45..5d7c5d23e 100644 --- a/Plugins/Mineplex.ChestConverter/src/mineplex/chestConverter/ChestConverter.java +++ b/Plugins/Mineplex.ChestConverter/src/mineplex/chestConverter/ChestConverter.java @@ -40,7 +40,7 @@ public class ChestConverter } _repository = new ChestConverterRepository(); - int lastId = 11056929; + int lastId = 18279475; int count = 50000; int numOfRowsProcessed = lastId; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/task/TaskClient.java b/Plugins/Mineplex.Core/src/mineplex/core/task/TaskClient.java index 22f565d58..9d4d4cdaa 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/task/TaskClient.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/task/TaskClient.java @@ -5,10 +5,10 @@ import java.util.List; public class TaskClient { - public List TasksCompleted; + public List TasksCompleted; public TaskClient() { - TasksCompleted = new ArrayList(); + TasksCompleted = new ArrayList(); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java b/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java index 75f7bbe52..05e07535e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java @@ -87,12 +87,26 @@ public class TaskManager extends MiniDbClientPlugin public boolean hasCompletedTask(Player player, String taskName) { - return Get(player.getName()).TasksCompleted.contains(taskName); + synchronized (_taskLock) + { + if (!_tasks.containsKey(taskName)) + { + return false; + } + + return Get(player.getName()).TasksCompleted.contains(_tasks.get(taskName)); + } } public void completedTask(final Callback callback, final Player player, final String taskName) { - Get(player.getName()).TasksCompleted.add(taskName); + synchronized (_taskLock) + { + if (_tasks.containsKey(taskName)) + { + Get(player.getName()).TasksCompleted.add(_tasks.get(taskName)); + } + } addTaskForOfflinePlayer(new Callback() { @@ -102,9 +116,12 @@ public class TaskManager extends MiniDbClientPlugin { System.out.println("Add task FAILED for " + player.getName()); - if (_tasks.containsKey(taskName)) + synchronized (_taskLock) { - Get(player.getName()).TasksCompleted.remove(taskName); + if (_tasks.containsKey(taskName)) + { + Get(player.getName()).TasksCompleted.remove(_tasks.get(taskName)); + } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/task/repository/TaskRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/task/repository/TaskRepository.java index 82d7d6d22..95a427d11 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/task/repository/TaskRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/task/repository/TaskRepository.java @@ -48,7 +48,7 @@ public class TaskRepository extends RepositoryBase while (resultSet.next()) { - taskClient.TasksCompleted.add(resultSet.getString(1)); + taskClient.TasksCompleted.add(resultSet.getInt(1)); } return taskClient; diff --git a/Website/LOC.Core/LOC.Core.csproj b/Website/LOC.Core/LOC.Core.csproj index c4601f0a9..e10c5ac35 100644 --- a/Website/LOC.Core/LOC.Core.csproj +++ b/Website/LOC.Core/LOC.Core.csproj @@ -71,7 +71,6 @@ - diff --git a/Website/LOC.Core/Model/Account/Account.cs b/Website/LOC.Core/Model/Account/Account.cs index 8662a770e..6375dbd94 100644 --- a/Website/LOC.Core/Model/Account/Account.cs +++ b/Website/LOC.Core/Model/Account/Account.cs @@ -55,8 +55,6 @@ public virtual List CustomBuilds { get; set; } - public virtual List Tasks { get; set; } - public virtual List IpAddresses { get; set; } public virtual List MacAddresses { get; set; } diff --git a/Website/LOC.Core/Model/Server/GameServer/GameTask.cs b/Website/LOC.Core/Model/Server/GameServer/GameTask.cs deleted file mode 100644 index e296bf4fb..000000000 --- a/Website/LOC.Core/Model/Server/GameServer/GameTask.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace LOC.Core.Model.Server.GameServer -{ - public class GameTask - { - public int GameTaskId { get; set; } - - public Account.Account Account { get; set; } - - public string TaskName { get; set; } - } -} diff --git a/Website/LOC.Core/Tokens/Client/ClientToken.cs b/Website/LOC.Core/Tokens/Client/ClientToken.cs index 4a1c02ff1..50dd6ef51 100644 --- a/Website/LOC.Core/Tokens/Client/ClientToken.cs +++ b/Website/LOC.Core/Tokens/Client/ClientToken.cs @@ -52,17 +52,6 @@ PetNameTagCount = account.PetNameTagCount }; - - TasksCompleted = new List(); - - if (account.Tasks != null) - { - foreach (var task in account.Tasks) - { - TasksCompleted.Add(task.TaskName); - } - } - if (account.Clan != null) { ClanToken = new ClientClanToken @@ -136,8 +125,6 @@ public List Punishments { get; set; } - public List TasksCompleted { get; set; } - public List FishTokens; public List IgnoredPlayers { get; set; } diff --git a/Website/LOC.Website.Common/Models/AccountAdministrator.cs b/Website/LOC.Website.Common/Models/AccountAdministrator.cs index e7912bfd2..3c19dedff 100644 --- a/Website/LOC.Website.Common/Models/AccountAdministrator.cs +++ b/Website/LOC.Website.Common/Models/AccountAdministrator.cs @@ -72,6 +72,7 @@ return accounts; } + /* public List GetTasksByCount(SearchConf searchConf) { var tasks = new List(); @@ -100,6 +101,7 @@ return tasks; } + */ private object getAccountLock(string name) { @@ -353,31 +355,6 @@ return true; } - public void AddTask(UpdateTaskToken token) - { - using (var repository = _repositoryFactory.CreateRepository()) - { - var account = repository.Where(x => x.Name == token.Name).OrderByDescending(x => x.LastLogin).Include(x => x.Tasks).FirstOrDefault(); - - if (account != null) - { - if (account.Tasks == null) - account.Tasks = new List(); - - var task = new GameTask - { - Account = account, - TaskName = token.NewTaskCompleted, - }; - - account.Tasks.Add(task); - - repository.Edit(account); - repository.CommitChanges(); - } - } - } - public PunishmentResponse Punish(PunishToken punish) { using (var repository = _repositoryFactory.CreateRepository()) diff --git a/Website/LOC.Website.Common/Models/IAccountAdministrator.cs b/Website/LOC.Website.Common/Models/IAccountAdministrator.cs index 1e6a1522f..89778c258 100644 --- a/Website/LOC.Website.Common/Models/IAccountAdministrator.cs +++ b/Website/LOC.Website.Common/Models/IAccountAdministrator.cs @@ -35,14 +35,11 @@ string PurchaseUnknownSalesPackage(UnknownPurchaseToken token); string UpdateRank(RankUpdateToken token); void RemoveBan(RemovePunishmentToken token); - void AddTask(UpdateTaskToken token); void UpdateAccountUUIDs(List tokens); bool CoinReward(GemRewardToken token); ClientToken GetAccountByUUID(string uuid); - - List GetTasksByCount(SearchConf searchConf); } } diff --git a/Website/LOC.Website.Web/Controllers/PlayerAccountController.cs b/Website/LOC.Website.Web/Controllers/PlayerAccountController.cs index fe4efc6a9..111ad720d 100644 --- a/Website/LOC.Website.Web/Controllers/PlayerAccountController.cs +++ b/Website/LOC.Website.Web/Controllers/PlayerAccountController.cs @@ -40,6 +40,7 @@ return Content(json, "application/json"); } + /* [HttpPost] public ActionResult GetTasksByCount(SearchConf searchConf) { @@ -48,6 +49,7 @@ var json = JsonConvert.SerializeObject(tasks); return Content(json, "application/json"); } + */ [HttpPost] public ActionResult GetAccountByUUID(string uuid) @@ -86,12 +88,6 @@ return Content(json, "application/json"); } - [HttpPost] - public void AddTask(UpdateTaskToken token) - { - _accountAdministrator.AddTask(token); - } - [HttpPost] public void ApplyKits(string name) { diff --git a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml index a57f4f271..360c78f15 100644 --- a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml +++ b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml @@ -1,13 +1,11 @@  - - @@ -20,17 +18,14 @@ - - + - - @@ -44,26 +39,26 @@ - + + - - - - + + + @@ -74,24 +69,25 @@ - - + - + + + - + + - @@ -99,7 +95,7 @@ - + @@ -107,42 +103,40 @@ - + + + - - + - - + + - - - + + - - @@ -153,27 +147,33 @@ - + - + + + + + + - + + @@ -184,92 +184,92 @@ - + - + + + - - + - + - - + + - + - + + - + - + - - + - + - - + - - + + - + - - + + - - + + - + - + @@ -280,22 +280,26 @@ - + - + + - + + + + @@ -303,16 +307,16 @@ + - - + @@ -322,7 +326,6 @@ - @@ -333,21 +336,21 @@ + - - + + + - - @@ -355,8 +358,6 @@ - - @@ -364,11 +365,12 @@ - - + + + @@ -382,28 +384,29 @@ - - + + + - + + + - - + - @@ -412,61 +415,56 @@ - - - - + - - + - + - - - + - + - + - + - - + + + - + - + @@ -474,65 +472,67 @@ - + - + - - + + + - + - + + - - + + - - + + - + - - - - - + + + + + - + - + @@ -545,14 +545,16 @@ - + + - + + @@ -566,27 +568,24 @@ - - - + - + - @@ -597,47 +596,48 @@ + - - + + - + - - + - - + + - - + + + @@ -645,22 +645,23 @@ - - + - + - + + + - + @@ -675,61 +676,57 @@ - - - - + - - + - - - + + + + - - - + - + - + - - + + + - + @@ -737,65 +734,68 @@ - - + + - + - + + - + + - + - + - + + - - + + - - + + - + - - - - - + + + + + - + - + @@ -808,14 +808,16 @@ - + + - + + @@ -829,17 +831,15 @@ - - - + @@ -849,7 +849,6 @@ - @@ -860,29 +859,29 @@ + - - + + - + - - + @@ -890,17 +889,18 @@ - - + + + @@ -908,22 +908,23 @@ - - + - + - + + + - + @@ -938,61 +939,57 @@ - - - - + - - + - + + - - - + - + - + - - + + + - + @@ -1000,56 +997,59 @@ - - + + - + - + + - + + - + - + + - - + + - - + + - + - - - - - + + + + + - + \ No newline at end of file diff --git a/Website/LOCWebsite.suo b/Website/LOCWebsite.suo index 933119909..acbad218b 100644 Binary files a/Website/LOCWebsite.suo and b/Website/LOCWebsite.suo differ