AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-07-02 20:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into paldiu-local

Browse Source
This commit is contained in:
Paldiu
2021-01-04 13:14:53 -06:00
parent a4e23dc03f 7fb6a2f087
commit c7b0f77910
15 changed files with 177 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/me/totalfreedom/totalfreedommod/util/FSync.java
View File

@ -11,8 +11,7 @@ public class FSync
public static void playerMsg(final Player player, final String message)
{
final TotalFreedomMod plugin = TotalFreedomMod.plugin();
assert plugin != null;
final TotalFreedomMod plugin = TotalFreedomMod.getPlugin();
new BukkitRunnable()
{
@ -27,8 +26,7 @@ public class FSync
public static void playerMsg(final CommandSender sender, final String message)
{
final TotalFreedomMod plugin = TotalFreedomMod.plugin();
assert plugin != null;
final TotalFreedomMod plugin = TotalFreedomMod.getPlugin();
new BukkitRunnable()
{
@ -43,8 +41,7 @@ public class FSync
public static void playerKick(final Player player, final String reason)
{
final TotalFreedomMod plugin = TotalFreedomMod.plugin();
assert plugin != null;
final TotalFreedomMod plugin = TotalFreedomMod.getPlugin();
new BukkitRunnable()
{
@ -59,8 +56,7 @@ public class FSync
public static void adminChatMessage(final CommandSender sender, final String message)
{
final TotalFreedomMod plugin = TotalFreedomMod.plugin();
assert plugin != null;
final TotalFreedomMod plugin = TotalFreedomMod.getPlugin();
new BukkitRunnable()
{
@ -75,8 +71,7 @@ public class FSync
public static void autoEject(final Player player, final String kickMessage)
{
final TotalFreedomMod plugin = TotalFreedomMod.plugin();
assert plugin != null;
final TotalFreedomMod plugin = TotalFreedomMod.getPlugin();
new BukkitRunnable()
{
@ -91,8 +86,7 @@ public class FSync
public static void bcastMsg(final String message, final ChatColor color)
{
final TotalFreedomMod plugin = TotalFreedomMod.plugin();
assert plugin != null;
final TotalFreedomMod plugin = TotalFreedomMod.getPlugin();
new BukkitRunnable()
{

13
src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
View File

@ -139,9 +139,16 @@ public class FUtil
public static boolean isDeveloper(Player player)
{
return DEVELOPERS.contains(player.getUniqueId().toString());
if (Bukkit.getOnlineMode())
{
return DEVELOPERS.contains(player.getUniqueId().toString());
}
else
{
return DEVELOPER_NAMES.contains(player.getName());
}
}
public static boolean inDeveloperMode()
{
return ConfigEntry.DEVELOPER_MODE.getBoolean();
@ -162,7 +169,7 @@ public class FUtil
List<String> names = new ArrayList<>();
for (Player player : Bukkit.getOnlinePlayers())
{
if (!Objects.requireNonNull(TotalFreedomMod.plugin()).al.isVanished(player.getName()))
if (!TotalFreedomMod.getPlugin().al.isVanished(player.getName()))
{
names.add(player.getName());
}

2
src/main/java/me/totalfreedom/totalfreedommod/util/History.java
View File

@ -65,7 +65,7 @@ public class History
FSync.playerMsg(sender, ChatColor.RED + "Player not found!");
}
}
}.runTaskAsynchronously(Objects.requireNonNull(TotalFreedomMod.plugin()));
}.runTaskAsynchronously(TotalFreedomMod.getPlugin());
}
private static void printHistory(CommandSender sender, FName[] oldNames)