From 787e6b867a6065b654e5de48a4d41ba30484504a Mon Sep 17 00:00:00 2001 From: Brettflan Date: Fri, 8 Jul 2011 22:06:55 -0500 Subject: [PATCH] Made /f kick command work on any player in any faction, if the person using the command has the admin-level "disband" permission --- src/org/mcteam/factions/FPlayer.java | 3 +- .../factions/commands/FCommandKick.java | 56 ++++++++++++------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/src/org/mcteam/factions/FPlayer.java b/src/org/mcteam/factions/FPlayer.java index 5f77ce04..3b938618 100644 --- a/src/org/mcteam/factions/FPlayer.java +++ b/src/org/mcteam/factions/FPlayer.java @@ -581,8 +581,7 @@ public class FPlayer { public static FPlayer find(String playername) { for (Entry entry : instances.entrySet()) { -// if (entry.getKey().equalsIgnoreCase(playername)) { - if (entry.getKey().startsWith(playername)) { + if (entry.getKey().equalsIgnoreCase(playername) || entry.getKey().startsWith(playername)) { return entry.getValue(); } } diff --git a/src/org/mcteam/factions/commands/FCommandKick.java b/src/org/mcteam/factions/commands/FCommandKick.java index e5f28852..f43aeef3 100644 --- a/src/org/mcteam/factions/commands/FCommandKick.java +++ b/src/org/mcteam/factions/commands/FCommandKick.java @@ -3,6 +3,7 @@ package org.mcteam.factions.commands; import org.mcteam.factions.Conf; import org.mcteam.factions.FPlayer; import org.mcteam.factions.Faction; +import org.mcteam.factions.Factions; public class FCommandKick extends FBaseCommand { @@ -29,34 +30,49 @@ public class FCommandKick extends FBaseCommand { return; } - Faction myFaction = me.getFaction(); - - if (you.getFaction() != myFaction) { - sendMessage(you.getNameAndRelevant(me)+Conf.colorSystem+" is not a member of "+myFaction.getTag(me)); - return; - } - if (me == you) { sendMessage("You cannot kick yourself."); sendMessage("You might want to: " + new FCommandLeave().getUseageTemplate(false)); return; } - - if (you.getRole().value >= me.getRole().value) { // TODO add more informative messages. - sendMessage("Your rank is too low to kick this player."); - return; + + Faction yourFaction = you.getFaction(); + Faction myFaction = me.getFaction(); + + // players with admin-level "disband" permission can bypass these requirements + if (!Factions.hasPermDisband(sender)) { + if (yourFaction != myFaction) { + sendMessage(you.getNameAndRelevant(me)+Conf.colorSystem+" is not a member of "+myFaction.getTag(me)); + return; + } + + if (you.getRole().value >= me.getRole().value) { // TODO add more informative messages. + sendMessage("Your rank is too low to kick this player."); + return; + } + + if (!Conf.CanLeaveWithNegativePower && you.getPower() < 0) { + sendMessage("You cannot kick that member until their power is positive."); + return; + } } - - if (!Conf.CanLeaveWithNegativePower && you.getPower() < 0) { - sendMessage("You cannot kick that member until their power is positive."); - return; + + yourFaction.sendMessage(me.getNameAndRelevant(yourFaction)+Conf.colorSystem+" kicked "+you.getNameAndRelevant(yourFaction)+Conf.colorSystem+" from the faction! :O"); + you.sendMessage(me.getNameAndRelevant(you)+Conf.colorSystem+" kicked you from "+yourFaction.getTag(you)+Conf.colorSystem+"! :O"); + if (yourFaction != myFaction) { + me.sendMessage(Conf.colorSystem+"You kicked "+you.getNameAndRelevant(myFaction)+Conf.colorSystem+" from the faction "+yourFaction.getTag(me)+Conf.colorSystem+"!"); } - - myFaction.deinvite(you); + + yourFaction.deinvite(you); you.resetFactionData(); - - myFaction.sendMessage(me.getNameAndRelevant(myFaction)+Conf.colorSystem+" kicked "+you.getNameAndRelevant(myFaction)+Conf.colorSystem+" from the faction! :O"); - you.sendMessage(me.getNameAndRelevant(you)+Conf.colorSystem+" kicked you from "+myFaction.getTag(you)+Conf.colorSystem+"! :O"); + + if (yourFaction.getFPlayers().isEmpty()) { + // Remove this faction + for (FPlayer fplayer : FPlayer.getAllOnline()) { + fplayer.sendMessage("The faction "+yourFaction.getTag(fplayer)+Conf.colorSystem+" was disbanded."); + } + Faction.delete(yourFaction.getId()); + } } }