6329fd0eaf
Patrick's Custom Event System Changes:
----------------------------------------
* FPlayerLeaveEvent now fires for all faction players in cmdDisband()
* FPlayerLeaveEvent removed from cmdJoin()
* FPlayerJoinEvent now only fires when the faction is different in cmdLeade
* Added FactionRenameEvent, firing on cmdTag()
* Added FactionRelationEvent, firing on FRelationCommand extensions
* Fixed FPlayerJoinEvent to fire after tag is set in cmdCreate()
* Added getFactionId() to FactionCreateEvent
TODO:
-------
* cmdLeader() might need a FPlayerLeaveEvent for the same reason it needs
a FPlayerJoinEvent?
On branch CustomFactionEvents
modified: src/com/massivecraft/factions/cmd/CmdCreate.java
modified: src/com/massivecraft/factions/cmd/CmdDisband.java
modified: src/com/massivecraft/factions/cmd/CmdJoin.java
modified: src/com/massivecraft/factions/cmd/CmdKick.java
modified: src/com/massivecraft/factions/cmd/CmdLeader.java
modified: src/com/massivecraft/factions/cmd/CmdTag.java
modified: src/com/massivecraft/factions/cmd/FRelationCommand.java
modified: src/com/massivecraft/factions/event/FPlayerLeaveEvent.java
modified: src/com/massivecraft/factions/event/FactionCreateEvent.java
new file: src/com/massivecraft/factions/event/FactionRelationEvent.java
new file: src/com/massivecraft/factions/event/FactionRenameEvent.java
modified: src/com/massivecraft/factions/event/LandClaimEvent.java
94 lines
3.2 KiB
Java
94 lines
3.2 KiB
Java
package com.massivecraft.factions.cmd;
|
|
|
|
import org.bukkit.Bukkit;
|
|
|
|
import com.massivecraft.factions.Conf;
|
|
import com.massivecraft.factions.Faction;
|
|
import com.massivecraft.factions.event.FactionRelationEvent;
|
|
import com.massivecraft.factions.integration.SpoutFeatures;
|
|
import com.massivecraft.factions.struct.FFlag;
|
|
import com.massivecraft.factions.struct.Permission;
|
|
import com.massivecraft.factions.struct.Rel;
|
|
|
|
public abstract class FRelationCommand extends FCommand
|
|
{
|
|
public Rel targetRelation;
|
|
|
|
public FRelationCommand()
|
|
{
|
|
super();
|
|
this.requiredArgs.add("faction");
|
|
//this.optionalArgs.put("", "");
|
|
|
|
this.permission = Permission.RELATION.node;
|
|
this.disableOnLock = true;
|
|
|
|
senderMustBePlayer = true;
|
|
senderMustBeMember = false;
|
|
senderMustBeOfficer = true;
|
|
senderMustBeLeader = false;
|
|
}
|
|
|
|
@Override
|
|
public void perform()
|
|
{
|
|
Faction them = this.argAsFaction(0);
|
|
if (them == null) return;
|
|
|
|
/*if ( ! them.isNormal())
|
|
{
|
|
msg("<b>Nope! You can't.");
|
|
return;
|
|
}*/
|
|
|
|
if (them == myFaction)
|
|
{
|
|
msg("<b>Nope! You can't declare a relation to yourself :)");
|
|
return;
|
|
}
|
|
|
|
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
|
|
if ( ! payForCommand(targetRelation.getRelationCost(), "to change a relation wish", "for changing a relation wish")) return;
|
|
|
|
// try to set the new relation
|
|
Rel oldRelation = myFaction.getRelationTo(them, true);
|
|
myFaction.setRelationWish(them, targetRelation);
|
|
Rel currentRelation = myFaction.getRelationTo(them, true);
|
|
|
|
// if the relation change was successful
|
|
if (targetRelation == currentRelation)
|
|
{
|
|
// trigger the faction relation event
|
|
FactionRelationEvent relationEvent = new FactionRelationEvent(myFaction, them, oldRelation, currentRelation);
|
|
Bukkit.getServer().getPluginManager().callEvent(relationEvent);
|
|
|
|
them.msg("%s<i> is now %s.", myFaction.describeTo(them, true), targetRelation.getDescFactionOne());
|
|
myFaction.msg("%s<i> is now %s.", them.describeTo(myFaction, true), targetRelation.getDescFactionOne());
|
|
}
|
|
// inform the other faction of your request
|
|
else
|
|
{
|
|
them.msg("%s<i> wishes to be %s.", myFaction.describeTo(them, true), targetRelation.getColor()+targetRelation.getDescFactionOne());
|
|
them.msg("<i>Type <c>/"+Conf.baseCommandAliases.get(0)+" "+targetRelation+" "+myFaction.getTag()+"<i> to accept.");
|
|
myFaction.msg("%s<i> were informed that you wish to be %s<i>.", them.describeTo(myFaction, true), targetRelation.getColor()+targetRelation.getDescFactionOne());
|
|
}
|
|
|
|
// TODO: The ally case should work!!
|
|
// * this might have to be bumped up to make that happen, & allow ALLY,NEUTRAL only
|
|
if ( targetRelation != Rel.TRUCE && them.getFlag(FFlag.PEACEFUL))
|
|
{
|
|
them.msg("<i>This will have no effect while your faction is peaceful.");
|
|
myFaction.msg("<i>This will have no effect while their faction is peaceful.");
|
|
}
|
|
|
|
if ( targetRelation != Rel.TRUCE && myFaction.getFlag(FFlag.PEACEFUL))
|
|
{
|
|
them.msg("<i>This will have no effect while their faction is peaceful.");
|
|
myFaction.msg("<i>This will have no effect while your faction is peaceful.");
|
|
}
|
|
|
|
SpoutFeatures.updateAppearances(myFaction, them);
|
|
SpoutFeatures.updateTerritoryDisplayLoc(null);
|
|
}
|
|
}
|