From a6cf1309ff0601e941be1353838e0f48c7287e23 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Wed, 13 May 2015 14:33:31 -0700 Subject: [PATCH] Fix for ranks not applying. --- .../core/account/CoreClientManager.java | 6 + .../Models/AccountAdministrator.cs | 2 +- .../LOC.Website.Web.Publish.xml | 444 +++++++++--------- 3 files changed, 229 insertions(+), 223 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java index 88aafb1af..8ba8f1650 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java @@ -208,6 +208,12 @@ public class CoreClientManager extends MiniPlugin if (uuid == null) uuid = UUIDFetcher.getUUIDOf(playerName); + if (uuid == null) + { + System.out.println("ERROR uuid is null. Can't load client by name."); + return; + } + String response = _repository.getClientByUUID(uuid); token = gson.fromJson(response, ClientToken.class); diff --git a/Website/LOC.Website.Common/Models/AccountAdministrator.cs b/Website/LOC.Website.Common/Models/AccountAdministrator.cs index 9d7bbd417..2c1f298ae 100644 --- a/Website/LOC.Website.Common/Models/AccountAdministrator.cs +++ b/Website/LOC.Website.Common/Models/AccountAdministrator.cs @@ -725,7 +725,7 @@ if (account == null) return "ALL"; - if (account.Rank.Name == "ADMIN" || account.Rank.Name == "OWNER" || account.Rank.Name == "DEVELOPER" || account.Rank.Name == "YOUTUBE") + if (account.Rank.Name == "LT" || account.Rank.Name == "OWNER") return account.Rank.Name; if (rank == null) diff --git a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml index 4d7cdc038..71278577d 100644 --- a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml +++ b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml @@ -1,7 +1,6 @@  - @@ -19,51 +18,47 @@ - - + - + + - - + - + - + - - - - - + + @@ -74,32 +69,31 @@ - - + - + + - + + - - - - + + @@ -107,41 +101,43 @@ + + + - + - - - + - - - - + + + + - + + @@ -152,74 +148,80 @@ - + - + + + + + + - + - + - + - + + + - - - + - + - - + + - + - + - - - + + + + @@ -227,50 +229,47 @@ - + - - + - - + + - - - + + - + - - + + - - + + - + - + - @@ -281,16 +280,18 @@ - + + + - + @@ -304,6 +305,7 @@ + @@ -311,19 +313,16 @@ - + - - - @@ -334,30 +333,29 @@ + - - + + - - + + - - @@ -365,40 +363,45 @@ - + - - + + + + - + + + - - + + + - + @@ -409,131 +412,127 @@ - + - - - - + - - + - + - - + - - + + - + + - - + - - + + - - + + - - - + + + + - + - + + - + - + - - + + - + - - + + - - + + - + - + - @@ -546,22 +545,21 @@ - + + - - + - @@ -576,8 +574,8 @@ - + @@ -586,8 +584,8 @@ + - @@ -598,20 +596,23 @@ + - + + - + + @@ -619,85 +620,82 @@ - - - + + - + + - - - + - - + - + + - + + - + + - + - - - - + - - + - - - + + + + @@ -707,96 +705,97 @@ - + + - + + - - + - + - - + + - + - + - + + - + - + - + + - + - - + - - + + - + - - + + - - + + - + - + - @@ -809,22 +808,21 @@ - + + - - + - @@ -839,8 +837,8 @@ - + @@ -849,8 +847,8 @@ + - @@ -861,20 +859,23 @@ + - + + - + + @@ -882,7 +883,6 @@ - @@ -891,76 +891,74 @@ - + + - - - + - - + - + + - + + - + + - + - - - - + - - + - + + @@ -970,86 +968,88 @@ - + + - + + - - + - + - - + + - + - + + - + - + + - + - - + - - + + - + - - + + - - + + - + \ No newline at end of file