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

incognito async stuff and updated alpha holograms

Browse Source
This commit is contained in:
Ben 2016-03-11 21:50:48 +00:00
parent bdfb55d4e1
commit 422df69335
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
View File

@ -279,8 +279,7 @@ public class FriendManager extends MiniDbClientPlugin<FriendData>
if (friend.Status == FriendStatusType.Accepted)
{
// Online Friend and not incognito
if (friend.Online && !IncognitoManager.Instance.getRepository().GetStatus(friend.Name))
if (friend.Online)
{
if (friend.ServerName.contains("Staff") || friend.ServerName.contains("CUST"))
{

8
Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendsGUI.java
View File

@ -129,16 +129,14 @@ public class FriendsGUI implements Listener
FriendStatus friend = friends.get(friendSlot);
boolean incognito = friend.Online ? IncognitoManager.Instance.getRepository().GetStatus(friend.Name) : false;
ItemBuilder builder = new ItemBuilder(Material.SKULL_ITEM, 1, (short) (friend.Online && !incognito ? 3 : 0));
ItemBuilder builder = new ItemBuilder(Material.SKULL_ITEM, 1, (short) (friend.Online ? 3 : 0));
builder.setTitle(C.cWhite + C.Bold + friend.Name);
builder.setPlayerHead(friend.Name);
builder.addLore(C.cGray + C.Bold + "Status: " + (friend.Online ? C.cDGreen + "Online" : C.cRed + "Offline"));
if (friend.Online && !incognito)
if (friend.Online)
{
builder.addLore(C.cGray + C.Bold + "Server: " + C.cYellow + friend.ServerName);
}
@ -276,7 +274,7 @@ public class FriendsGUI implements Listener
FriendStatus friend = friends.get(friendSlot);
boolean incognito = friend.Online ? IncognitoManager.Instance.getRepository().GetStatus(friend.Name) : false;
boolean incognito = friend.Online;
ItemBuilder builder = new ItemBuilder(Material.SKULL_ITEM, 1, (short) (friend.Online && !incognito ? 3 : 0));

3
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
View File

@ -381,9 +381,8 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
for (Location location : welcomeHolograms)
{
Hologram hologram = new Hologram(hologramManager, location,
C.cGreenB + "Welcome to Clans Alpha",
C.cGreenB + "Welcome to Clans Beta",
C.cWhite + "Please be aware there may be bugs",
C.cWhite + "Map may reset at any time during Alpha!",
C.cWhite + "Type " + C.cYellow + "/clan" + C.cWhite + " to get started!"
);
hologram.start();