mirror of
https://github.com/TotalFreedomMC/TFGuilds.git
synced 2024-12-22 16:05:00 +00:00
check if tfm isn't detected
This commit is contained in:
parent
faeb098959
commit
8fd15988e0
6 changed files with 22 additions and 9 deletions
|
@ -1,14 +1,13 @@
|
||||||
package me.totalfreedom.tfguilds;
|
package me.totalfreedom.tfguilds;
|
||||||
|
|
||||||
import me.totalfreedom.tfguilds.config.ConfigEntry;
|
|
||||||
import me.totalfreedom.tfguilds.guild.Guild;
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import me.totalfreedom.tfguilds.config.ConfigEntry;
|
||||||
|
import me.totalfreedom.tfguilds.guild.Guild;
|
||||||
|
import org.bukkit.ChatColor;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
public class Common
|
public class Common
|
||||||
{
|
{
|
||||||
|
|
|
@ -15,6 +15,7 @@ import org.bukkit.plugin.java.JavaPlugin;
|
||||||
public final class TFGuilds extends JavaPlugin
|
public final class TFGuilds extends JavaPlugin
|
||||||
{
|
{
|
||||||
private static TFGuilds plugin;
|
private static TFGuilds plugin;
|
||||||
|
|
||||||
public static TFGuilds getPlugin()
|
public static TFGuilds getPlugin()
|
||||||
{
|
{
|
||||||
return plugin;
|
return plugin;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package me.totalfreedom.tfguilds.bridge;
|
package me.totalfreedom.tfguilds.bridge;
|
||||||
|
|
||||||
import me.totalfreedom.tfguilds.TFGuilds;
|
import me.totalfreedom.tfguilds.TFGuilds;
|
||||||
|
import me.totalfreedom.tfguilds.util.GLog;
|
||||||
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
|
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
@ -39,11 +40,23 @@ public class TFMBridge
|
||||||
|
|
||||||
public boolean isAdmin(Player player)
|
public boolean isAdmin(Player player)
|
||||||
{
|
{
|
||||||
|
if (getTFM() == null)
|
||||||
|
{
|
||||||
|
GLog.warn("TFM not detected on the server. Checking if player is OP...");
|
||||||
|
return player.isOp();
|
||||||
|
}
|
||||||
|
|
||||||
return getTFM().al.isAdmin(player);
|
return getTFM().al.isAdmin(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isAdmin(CommandSender sender)
|
public boolean isAdmin(CommandSender sender)
|
||||||
{
|
{
|
||||||
|
if (getTFM() == null)
|
||||||
|
{
|
||||||
|
GLog.warn("TFM not detected on the server. Checking if sender is OP...");
|
||||||
|
return sender.isOp();
|
||||||
|
}
|
||||||
|
|
||||||
return getTFM().al.isAdmin(sender);
|
return getTFM().al.isAdmin(sender);
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,5 +1,6 @@
|
||||||
package me.totalfreedom.tfguilds.command;
|
package me.totalfreedom.tfguilds.command;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
import me.totalfreedom.tfguilds.Common;
|
import me.totalfreedom.tfguilds.Common;
|
||||||
import me.totalfreedom.tfguilds.guild.Guild;
|
import me.totalfreedom.tfguilds.guild.Guild;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
|
@ -8,8 +9,6 @@ import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandExecutor;
|
import org.bukkit.command.CommandExecutor;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class ListSubcommand extends Common implements CommandExecutor
|
public class ListSubcommand extends Common implements CommandExecutor
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -305,8 +305,10 @@ public class Guild
|
||||||
if (sender != null)
|
if (sender != null)
|
||||||
{
|
{
|
||||||
if (player == sender)
|
if (player == sender)
|
||||||
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
player.sendMessage(GUtil.colorize("&7[GUILD CHAT SPY | " + GUtil.colorize(name) + "] " + as + ": " + msg));
|
player.sendMessage(GUtil.colorize("&7[GUILD CHAT SPY | " + GUtil.colorize(name) + "] " + as + ": " + msg));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
package me.totalfreedom.tfguilds.guild;
|
package me.totalfreedom.tfguilds.guild;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
import me.totalfreedom.tfguilds.TFGuilds;
|
import me.totalfreedom.tfguilds.TFGuilds;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class GuildRank
|
public class GuildRank
|
||||||
{
|
{
|
||||||
private static TFGuilds plugin = TFGuilds.getPlugin();
|
private static TFGuilds plugin = TFGuilds.getPlugin();
|
||||||
|
|
Loading…
Reference in a new issue