Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple

This commit is contained in:
Sam 2016-06-01 22:04:13 +01:00
commit e6ab50c5b3
2 changed files with 0 additions and 55 deletions

View File

@ -242,8 +242,6 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
_damageManager = new DamageManager(plugin, _combatManager, _npcManager, _disguiseManager, _condition); _damageManager = new DamageManager(plugin, _combatManager, _npcManager, _disguiseManager, _condition);
_damageManager.addCommand(new KillCommand(_damageManager)); _damageManager.addCommand(new KillCommand(_damageManager));
addCommand(new QueryCommand(this));
_worldEvent = new WorldEventManager(plugin, this, _damageManager, _lootManager, blockRestore, _clanRegions, null); _worldEvent = new WorldEventManager(plugin, this, _damageManager, _lootManager, blockRestore, _clanRegions, null);
_taskManager = new TaskManager(plugin, _clientManager, webServerAddress); _taskManager = new TaskManager(plugin, _clientManager, webServerAddress);

View File

@ -1,53 +0,0 @@
package mineplex.game.clans.clans.commands;
import org.bukkit.entity.Player;
import mineplex.core.command.CommandBase;
import mineplex.core.common.Rank;
import mineplex.core.common.util.Callback;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.database.MinecraftRepository;
import mineplex.game.clans.clans.ClanInfo;
import mineplex.game.clans.clans.ClansManager;
import mineplex.serverdata.database.DBPool;
import mineplex.serverdata.database.RepositoryBase;
public class QueryCommand extends CommandBase<ClansManager>
{
private ClansManager _clansManager;
public QueryCommand(ClansManager plugin)
{
super(plugin, Rank.JNR_DEV, "query");
_clansManager = plugin;
}
@Override
public void Execute(final Player caller, String[] args)
{
if (args.length == 0)
{
UtilPlayer.message(caller, F.main(Plugin.getName(), "Query missing."));
return;
}
final String query = F.combine(args, 0, null, false);
new MinecraftRepository(Plugin.getPlugin(), DBPool.getAccount()) {
protected void initialize()
{
executeUpdate(query);
}
protected void update()
{
}
};
}
public static void message(Player player, String message)
{
UtilPlayer.message(player, F.main("Clans", message));
}
}