EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working on auto claim

Browse Source
This commit is contained in:
Olof Larsson
2013-04-24 15:14:15 +02:00
parent f6da2d397b
commit aa989db8f7
6 changed files with 70 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java
View File

@@ -24,16 +24,16 @@ public class CmdFactionsAutoClaim extends FCommand
public void perform()
{
Faction forFaction = this.arg(0, ARFaction.get(myFaction), myFaction);
if (forFaction == null || forFaction == fme.getAutoClaimFor())
if (forFaction == null || forFaction == fme.getAutoClaimFaction())
{
fme.setAutoClaimFor(null);
fme.setAutoClaimFaction(null);
msg("<i>Auto-claiming of land disabled.");
return;
}
if ( ! FPerm.TERRITORY.has(fme, forFaction, true)) return;
if (forFaction.isNormal() && !FPerm.TERRITORY.has(fme, forFaction, true)) return;
fme.setAutoClaimFor(forFaction);
fme.setAutoClaimFaction(forFaction);
msg("<i>Now auto-claiming land for <h>%s<i>.", forFaction.describeTo(fme));
fme.tryClaim(forFaction, PS.valueOf(me), true, true);

6
src/com/massivecraft/factions/cmd/CmdFactionsMap.java
View File

@@ -28,11 +28,11 @@ public class CmdFactionsMap extends FCommand
return;
}
if (this.arg(0, ARBoolean.get(), !fme.isMapAutoUpdating()))
if (this.arg(0, ARBoolean.get(), !mme.isMapAutoUpdating()))
{
// Turn on
fme.setMapAutoUpdating(true);
mme.setMapAutoUpdating(true);
msg("<i>Map auto update <green>ENABLED.");
// And show the map once
@@ -41,7 +41,7 @@ public class CmdFactionsMap extends FCommand
else
{
// Turn off
fme.setMapAutoUpdating(false);
mme.setMapAutoUpdating(false);
msg("<i>Map auto update <red>DISABLED.");
}
}

3
src/com/massivecraft/factions/cmd/FCommand.java
View File

@@ -1,6 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.UPlayer;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.mcore.cmd.MCommand;
@@ -8,12 +9,14 @@ import com.massivecraft.mcore.util.Txt;
public abstract class FCommand extends MCommand
{
public MPlayer mme;
public UPlayer fme;
public Faction myFaction;
@Override
public void fixSenderVars()
{
this.mme = MPlayer.get(sender);
this.fme = UPlayer.get(this.sender);
this.myFaction = this.fme.getFaction();
}