AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-07-05 10:00:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

More AdminWorld tweaks.

Browse Source
This commit is contained in:
StevenLawson 2013-08-12 12:38:46 -04:00
parent 699d366efb
commit 6a5306dd7a
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java
View File

@ -20,6 +20,7 @@ public class TFM_AdminWorld
private static final String GENERATION_PARAMETERS = "16,stone,32,dirt,1,grass"; private static final String GENERATION_PARAMETERS = "16,stone,32,dirt,1,grass";
private static final String ADMINWORLD_NAME = "adminworld"; private static final String ADMINWORLD_NAME = "adminworld";
private final Map<CommandSender, Boolean> superadminCache = new HashMap<CommandSender, Boolean>(); private final Map<CommandSender, Boolean> superadminCache = new HashMap<CommandSender, Boolean>();
private Long cacheLastCleared = null;
private World adminWorld = null; private World adminWorld = null;
private TFM_AdminWorld() private TFM_AdminWorld()
@ -33,10 +34,7 @@ public class TFM_AdminWorld
return; return;
} }
if (adminWorld == null || !Bukkit.getWorlds().contains(adminWorld)) loadAdminWorld();
{
generateWorld();
}
player.teleport(adminWorld.getSpawnLocation()); player.teleport(adminWorld.getSpawnLocation());
} }
@ -48,7 +46,7 @@ public class TFM_AdminWorld
if (event.getTo().getWorld() == adminWorld) if (event.getTo().getWorld() == adminWorld)
{ {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
if (!isUserSuperadmin(player)) if (!cachedIsUserSuperadmin(player))
{ {
new BukkitRunnable() new BukkitRunnable()
{ {
@ -66,8 +64,23 @@ public class TFM_AdminWorld
return true; return true;
} }
private boolean isUserSuperadmin(CommandSender user) public void loadAdminWorld()
{ {
if (adminWorld == null || !Bukkit.getWorlds().contains(adminWorld))
{
generateWorld();
}
}
private boolean cachedIsUserSuperadmin(CommandSender user)
{
long currentTimeMillis = System.currentTimeMillis();
if (cacheLastCleared == null || cacheLastCleared.longValue() >= currentTimeMillis + (10L * 1000L)) // Wipe every 10 seconds.
{
cacheLastCleared = currentTimeMillis;
superadminCache.clear();
}
Boolean cached = superadminCache.get(user); Boolean cached = superadminCache.get(user);
if (cached == null) if (cached == null)
{ {

2
src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
View File

@ -83,6 +83,8 @@ public class TotalFreedomMod extends JavaPlugin
TFM_Util.generateFlatlands(flatlandsGenerationParams); TFM_Util.generateFlatlands(flatlandsGenerationParams);
} }
TFM_AdminWorld.getInstance().loadAdminWorld();
if (disableWeather) if (disableWeather)
{ {
for (World world : server.getWorlds()) for (World world : server.getWorlds())