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

Code style fixes

This commit is contained in:
Dan Mulloy 2018-02-14 14:50:45 -05:00 committed by Alexander Meech
parent ea276c5120
commit 8c07d34234
10 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plugins/Mineplex.Core/src/mineplex/core/communities/Community.java
View File

@ -143,8 +143,13 @@ public class Community
public void setFlag(String flag, boolean value)
{
if (value) flags.add(flag.toLowerCase());
else flags.remove(flag.toLowerCase());
if (value)
{
flags.add(flag.toLowerCase());
} else
{
flags.remove(flag.toLowerCase());
}
}
public boolean getFlag(String flag)

30
Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityManager.java
View File

@ -110,14 +110,11 @@ public class CommunityManager extends MiniDbClientPlugin<CommunityMemberData>
private final CommunityRepository _repo;
private final Map<Integer, Community> _loadedCommunities;
private final Random rand = new Random();
private final Random _rand = new Random();
private final List<Integer> _browserIds = new LinkedList<>();
private final List<UUID> _creating = new ArrayList<>();
// private final DataRepository<PlayerStatus> StatusRepository;
// private ServerRepository _serverRepo;
private boolean _us;
private final Set<Community> dirty = Collections.newSetFromMap(new ConcurrentHashMap<>()); // Communities with redis updates
@ -125,7 +122,7 @@ public class CommunityManager extends MiniDbClientPlugin<CommunityMemberData>
private int _updateCycleCount; // The number of update cycles since we've updated all communities
private volatile boolean _cycling = false;
private CoreClientManager _clientManager;
private final CoreClientManager _clientManager;
@SuppressWarnings("deprecation")
public CommunityManager()
@ -141,7 +138,8 @@ public class CommunityManager extends MiniDbClientPlugin<CommunityMemberData>
_loadedCommunities = new ConcurrentHashMap<>();
runAsync(() -> {
runAsync(() ->
{
_repo.loadBrowserCommunities(_browserIds);
log("Loaded " + _browserIds.size() + " communities to show in browser");
});
@ -206,7 +204,8 @@ public class CommunityManager extends MiniDbClientPlugin<CommunityMemberData>
}, 0L, 20 * UPDATE_CYCLE_SECONDS);
Bukkit.getScheduler().scheduleSyncRepeatingTask(_plugin, this::cycleBrowser, 0L, 20 * 30);
// Handled in join events now
// _repo.handlePlayerJoin(_loadedCommunities);
addCommand(new CommunityCommand(this));
@ -231,7 +230,9 @@ public class CommunityManager extends MiniDbClientPlugin<CommunityMemberData>
int comId = Integer.parseInt(group.getName().split("-")[1]);
Community community = getLoadedCommunity(comId);
if (community == null)
{
community = _repo.loadCommunity(_loadedCommunities, comId);
}
community.setFlag("persist", true);
}
@ -276,7 +277,7 @@ public class CommunityManager extends MiniDbClientPlugin<CommunityMemberData>
_cycling = true;
runAsync(() ->
{
Collections.shuffle(_browserIds, rand);
Collections.shuffle(_browserIds, _rand);
runSync(() ->
{
@ -300,7 +301,9 @@ public class CommunityManager extends MiniDbClientPlugin<CommunityMemberData>
{
Community com = _loadedCommunities.get(id);
if (com != null)
{
com.setFlag("display", true);
}
}
}
@ -748,7 +751,9 @@ public class CommunityManager extends MiniDbClientPlugin<CommunityMemberData>
{
_repo.updateCommunitySetting(setting, community.getId(), newValue);
if (setting == CommunitySetting.PRIVACY)
{
updateBrowserStatus(community);
}
});
new CommunityUpdateSetting(community.getId(), sender.getName(), setting.toString(), newValue).publish();
}
@ -900,7 +905,10 @@ public class CommunityManager extends MiniDbClientPlugin<CommunityMemberData>
Set<Integer> communityIds = Get(player).getCommunityIds();
final List<Integer> load = communityIds.stream().filter(id -> getLoadedCommunity(id) == null).collect(Collectors.toList());
if (load.isEmpty()) return;
if (load.isEmpty())
{
return;
}
final int accountId = _clientManager.getAccountId(player);
@ -921,7 +929,9 @@ public class CommunityManager extends MiniDbClientPlugin<CommunityMemberData>
{
if (community.getFlag("persist")
|| community.getMembers().keySet().stream().anyMatch(uuid -> !player.getUniqueId().equals(uuid) && Bukkit.getPlayer(uuid) != null))
{
continue;
}
System.out.println("Unloading community: " + community.getId());

2
Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityMemberData.java
View File

@ -56,7 +56,9 @@ public class CommunityMemberData
{
Community community = Managers.get(CommunityManager.class).getLoadedCommunity(id);
if (community != null)
{
ret.add(community);
}
}
return ret;

2
Plugins/Mineplex.Core/src/mineplex/core/communities/gui/browser/CommunityBrowserPage.java
View File

@ -113,7 +113,7 @@ public class CommunityBrowserPage extends CommunitiesGUIPage
}
}
CommunityBrowserButton button = new CommunityBrowserButton(Viewer, getCommunityManager().getLoadedCommunity(manager.getBrowserIds().get(i)));
// _displaying.add(manager.getBrowserIds().get(i));
// _displaying.add(manager.getBrowserIds().get(i)); -- moved up
Buttons.put(slot, button);
Inv.setItem(slot, button.Button);

5
Plugins/Mineplex.Core/src/mineplex/core/monitor/LagMeter.java
View File

@ -167,13 +167,12 @@ public class LagMeter extends MiniPlugin
player.sendMessage(F.main(getName(), ChatColor.GRAY + "Avg--------" + ChatColor.YELLOW + String.format("%.00f", _ticksPerSecondAverage * 20)));
player.sendMessage(F.main(getName(), ChatColor.YELLOW + "MC Timings (5,10,15 min avg)"));
player.sendMessage(F.main(getName(), ChatColor.GRAY + mcString.toString()));
player.sendMessage(F.main(getName(), ChatColor.YELLOW + "MEM"));
player.sendMessage(F.main(getName(), ChatColor.YELLOW + "Memory"));
player.sendMessage(F.main(getName(), ChatColor.GRAY + "Free-------" + ChatColor.YELLOW + (Runtime.getRuntime().freeMemory() / 1048576) + "MB"));
player.sendMessage(F.main(getName(), ChatColor.GRAY + "Max--------" + ChatColor.YELLOW + (Runtime.getRuntime().maxMemory() / 1048576)) + "MB");
// Statistics for Dan, ideally this'll be temporary
player.sendMessage(" ");
player.sendMessage(F.main(getName(), ChatColor.GRAY + "Temp Stats -----"));
player.sendMessage(F.main(getName(), ChatColor.GRAY + "In Memory -----"));
player.sendMessage(F.main(getName(), ChatColor.YELLOW + String.valueOf(player.getWorld().getLoadedChunks().length) + ChatColor.GRAY + " chunks loaded"));

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

@ -456,7 +456,7 @@ public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelat
_bannerManager.loadBanners(this);
new PersonalServerManager(plugin, _clientManager).setUseInterfaceItem(false);
new CommunityManager();
require(CommunityManager.class);
Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "Replay|Restrict");

2
Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/HubManager.java
View File

@ -239,7 +239,7 @@ public class HubManager extends MiniPlugin implements IChatMessageFormatter
new SalesAnnouncementManager(plugin);
new PersonalServerManager(plugin, _clientManager).setUseInterfaceItem(false);
new CommunityManager();
require(CommunityManager.class);
require(TabListSorter.class);
ScoreboardManager scoreboardManager = new ScoreboardManager(plugin)
{

2
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -214,7 +214,7 @@ public class HubManager extends MiniClientPlugin<HubClient> implements IChatMess
new SalesAnnouncementManager(_plugin);
new CommunityManager();
require(CommunityManager.class);
_hologramManager = hologramManager;

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

@ -408,7 +408,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
addCommand(new TauntCommand(this));
new PersonalServerManager(plugin, _clientManager).setUseInterfaceItem(false);
new CommunityManager();
require(CommunityManager.class);
_scoreboardManager = new ScoreboardManager(_plugin)
{

2
Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/GemHunters.java
View File

@ -217,7 +217,7 @@ public class GemHunters extends JavaPlugin
new PartyManager();
// Communities
new CommunityManager();
require(CommunityManager.class);
// Fixes
new MemoryFix(this);