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

Better claiming. Step 1.

Browse Source
This commit is contained in:
Olof Larsson
2014-10-13 11:42:40 +02:00
parent b54293577d
commit c690d33ad6
16 changed files with 506 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java
View File

@ -1,5 +1,7 @@
package com.massivecraft.factions.cmd;
import java.util.Collections;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.entity.Faction;
@ -50,7 +52,8 @@ public class CmdFactionsAutoClaim extends FactionsCommand
msender.setAutoClaimFaction(forFaction);
msg("<i>Now auto-claiming land for <h>%s<i>.", forFaction.describeTo(msender));
msender.tryClaim(forFaction, PS.valueOf(me), true, true);
msender.tryClaim(forFaction, Collections.singletonList(PS.valueOf(me).getChunk(true)));
}
}

76
src/main/java/com/massivecraft/factions/cmd/CmdFactionsClaim.java
View File

@ -1,11 +1,13 @@
package com.massivecraft.factions.cmd;
import java.util.LinkedHashSet;
import java.util.Set;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.factions.task.SpiralTask;
import com.massivecraft.massivecore.cmd.arg.ARInteger;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.cmd.req.ReqIsPlayer;
@ -43,68 +45,52 @@ public class CmdFactionsClaim extends FactionsCommand
Integer radius = this.arg(0, ARInteger.get(), 1);
if (radius == null) return;
final Faction forFaction = this.arg(1, ARFaction.get(), msenderFaction);
if (forFaction == null) return;
final Faction newFaction = this.arg(1, ARFaction.get(), msenderFaction);
if (newFaction == null) return;
// MPerm
if (forFaction.isNormal() && !MPerm.getPermTerritory().has(msender, forFaction, true)) return;
if (newFaction.isNormal() && ! MPerm.getPermTerritory().has(msender, newFaction, true)) return;
// Validate
// Radius Claim Min
if (radius < 1)
{
msg("<b>If you specify a radius, it must be at least 1.");
return;
}
if (radius > MConf.get().radiusClaimRadiusLimit && !msender.isUsingAdminMode())
// Radius Claim Perm
if (radius > 1 && ! Perm.CLAIM_RADIUS.has(sender, false))
{
msg("<b>You do not have permission to claim in a radius.");
return;
}
// Radius Claim Max
if (radius > MConf.get().radiusClaimRadiusLimit && ! msender.isUsingAdminMode())
{
msg("<b>The maximum radius allowed is <h>%s<b>.", MConf.get().radiusClaimRadiusLimit);
return;
}
// Apply
// single chunk
if (radius < 2)
// Get Chunks
final int radiusZero = radius -1;
final PS chunk = PS.valueOf(me).getChunk(true);
final int xmin = chunk.getChunkX() - radiusZero;
final int xmax = chunk.getChunkX() + radiusZero;
final int zmin = chunk.getChunkZ() - radiusZero;
final int zmax = chunk.getChunkZ() + radiusZero;
Set<PS> chunks = new LinkedHashSet<PS>();
chunks.add(chunk); // The center should come first for pretty messages
for (int x = xmin; x <= xmax; x++)
{
msender.tryClaim(forFaction, PS.valueOf(me), true, true);
return;
}
// radius claim
if (!Perm.CLAIM_RADIUS.has(sender, false))
{
msg("<b>You do not have permission to claim in a radius.");
return;
}
// TODO: There must be a better way than using a spiral task.
// TODO: Do some research to allow for claming sets of chunks in a batch with atomicity.
// This will probably result in an alteration to the owner change event.
// It would possibly contain a set of chunks instead of a single chunk.
new SpiralTask(PS.valueOf(me), radius)
{
private int failCount = 0;
private final int limit = MConf.get().radiusClaimFailureLimit - 1;
@Override
public boolean work()
for (int z = zmin; z <= zmax; z++)
{
boolean success = msender.tryClaim(forFaction, PS.valueOf(this.currentLocation()), true, true);
if (success)
{
this.failCount = 0;
}
else if (this.failCount++ >= this.limit)
{
this.stop();
return false;
}
return true;
chunks.add(chunk.withChunkX(x).withChunkZ(z));
}
};
}
// Apply / Inform
msender.tryClaim(newFaction, chunks);
}
}

4
src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java
View File

@ -1,5 +1,7 @@
package com.massivecraft.factions.cmd;
import java.util.Collections;
import com.massivecraft.factions.cmd.req.ReqHasFaction;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.FactionColl;
@ -37,7 +39,7 @@ public class CmdFactionsUnclaim extends FactionsCommand
Faction newFaction = FactionColl.get().getNone();
// Apply
if (msender.tryClaim(newFaction, chunk, true, true)) return;
if (msender.tryClaim(newFaction, Collections.singletonList(chunk))) return;
}
}

11
src/main/java/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java
View File

@ -2,7 +2,6 @@ package com.massivecraft.factions.cmd;
import java.util.Set;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.req.ReqHasFaction;
@ -10,9 +9,7 @@ import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast;
import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.MPerm;
import com.massivecraft.factions.event.EventFactionsChunkChange;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
import com.massivecraft.massivecore.ps.PS;
@ -49,12 +46,15 @@ public class CmdFactionsUnclaimall extends FactionsCommand
// Apply
Set<PS> chunks = BoardColl.get().getChunks(faction);
msender.tryClaim(newFaction, chunks);
/*
int countTotal = chunks.size();
int countSuccess = 0;
int countFail = 0;
for (PS chunk : chunks)
{
EventFactionsChunkChange event = new EventFactionsChunkChange(sender, chunk, newFaction);
EventFactionsChunksChange event = new EventFactionsChunksChange(sender, chunk, newFaction);
event.run();
if (event.isCancelled())
{
@ -74,7 +74,8 @@ public class CmdFactionsUnclaimall extends FactionsCommand
if (MConf.get().logLandUnclaims)
{
Factions.get().log(msender.getName()+" unclaimed everything for the faction: "+msenderFaction.getName());
}
}*/
}
}