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

updates

Browse Source
This commit is contained in:
Ben 2016-03-11 19:03:32 +00:00
parent a27fb90c2a
commit 86c50cc3cd
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Core/src/mineplex/core/incognito/IncognitoManager.java
View File

@ -64,12 +64,6 @@ public class IncognitoManager extends MiniClientPlugin<IncognitoClient>
{
other.showPlayer(caller);
}
UtilServer.broadcast(F.sys("Join", caller.getName()));
}
else
{
UtilServer.broadcast(F.sys("Quit", caller.getName()));
}
runAsync(() -> _repository.SetStatus(_clientManager.getAccountId(caller), enabled));

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

@ -557,15 +557,6 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
}
}
@EventHandler
public void StaffIncognito(IncognitoStatusChangeEvent event)
{
if (event.getNewState())
{
UtilServer.broadcast(F.sys("Quit", event.getPlayer().getName()));
}
}
@EventHandler
public void disableEnderpeal(PlayerInteractEvent event)
{
@ -1070,6 +1061,19 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
_playTracker.onDisable();
}
@EventHandler
public void StaffIncognito(IncognitoStatusChangeEvent event)
{
if (event.getNewState())
{
UtilServer.broadcast(F.sys("Quit", event.getPlayer().getName()));
}
else
{
UtilServer.broadcast(F.sys("Join", event.getPlayer().getName()));
}
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onJoin(PlayerLoginEvent event)
{

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -613,7 +613,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
@EventHandler
public void StaffIncognito(IncognitoStatusChangeEvent event)
{
if (_game != null && _game.IsPlaying(event.getPlayer()) && _game.IsLive())
if (event.getNewState() && _game != null && _game.IsPlaying(event.getPlayer()) && _game.IsLive())
{
UtilPlayer.message(event.getPlayer(), F.main("Incognito", "You may not go incognito whilst in a game."));
event.setCancelled(true);
@ -624,6 +624,10 @@ public class ArcadeManager extends MiniPlugin implements IRelation
{
UtilServer.broadcast(F.sys("Quit", event.getPlayer().getName()));
}
else
{
UtilServer.broadcast(F.sys("Join", event.getPlayer().getName()));
}
}
@EventHandler