Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-12-11 19:36:46 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #963 from XXLuigiMario/allow-unclaimall-world

Browse Source 
Allow unclaiming all safezones and warzones in a specific world
This commit is contained in:
Trent Hensler 2017-12-19 00:16:57 -08:00 committed by GitHub
commit 0b9f2dd7dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/massivecraft/factions/Board.java
View File

@ -1,6 +1,7 @@
package com.massivecraft.factions; package com.massivecraft.factions;
import com.massivecraft.factions.zcore.persist.json.JSONBoard; import com.massivecraft.factions.zcore.persist.json.JSONBoard;
import org.bukkit.World;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Set; import java.util.Set;
@ -43,6 +44,8 @@ public abstract class Board {
public abstract void unclaimAll(String factionId); public abstract void unclaimAll(String factionId);
public abstract void unclaimAllInWorld(String factionId, World world);
// Is this coord NOT completely surrounded by coords claimed by the same faction? // Is this coord NOT completely surrounded by coords claimed by the same faction?
// Simpler: Is there any nearby coord with a faction other than the faction here? // Simpler: Is there any nearby coord with a faction other than the faction here?
public abstract boolean isBorderLocation(FLocation flocation); public abstract boolean isBorderLocation(FLocation flocation);

20
src/main/java/com/massivecraft/factions/cmd/CmdSafeunclaimall.java
View File

@ -6,6 +6,8 @@ import com.massivecraft.factions.Factions;
import com.massivecraft.factions.P; import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.World;
public class CmdSafeunclaimall extends FCommand { public class CmdSafeunclaimall extends FCommand {
@ -14,7 +16,7 @@ public class CmdSafeunclaimall extends FCommand {
this.aliases.add("safedeclaimall"); this.aliases.add("safedeclaimall");
//this.requiredArgs.add(""); //this.requiredArgs.add("");
//this.optionalArgs.put("radius", "0"); this.optionalArgs.put("world", "all");
this.permission = Permission.MANAGE_SAFE_ZONE.node; this.permission = Permission.MANAGE_SAFE_ZONE.node;
this.disableOnLock = true; this.disableOnLock = true;
@ -28,7 +30,21 @@ public class CmdSafeunclaimall extends FCommand {
@Override @Override
public void perform() { public void perform() {
Board.getInstance().unclaimAll(Factions.getInstance().getSafeZone().getId()); String worldName = argAsString(0);
World world = null;
if (worldName != null) {
world = Bukkit.getWorld(worldName);
}
String id = Factions.getInstance().getSafeZone().getId();
if (world == null) {
Board.getInstance().unclaimAll(id);
} else {
Board.getInstance().unclaimAllInWorld(id, world);
}
msg(TL.COMMAND_SAFEUNCLAIMALL_UNCLAIMED); msg(TL.COMMAND_SAFEUNCLAIMALL_UNCLAIMED);
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {

20
src/main/java/com/massivecraft/factions/cmd/CmdWarunclaimall.java
View File

@ -6,6 +6,8 @@ import com.massivecraft.factions.Factions;
import com.massivecraft.factions.P; import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.World;
public class CmdWarunclaimall extends FCommand { public class CmdWarunclaimall extends FCommand {
@ -14,7 +16,7 @@ public class CmdWarunclaimall extends FCommand {
this.aliases.add("wardeclaimall"); this.aliases.add("wardeclaimall");
//this.requiredArgs.add(""); //this.requiredArgs.add("");
//this.optionalArgs.put("", ""); this.optionalArgs.put("world", "all");
this.permission = Permission.MANAGE_WAR_ZONE.node; this.permission = Permission.MANAGE_WAR_ZONE.node;
this.disableOnLock = true; this.disableOnLock = true;
@ -27,8 +29,20 @@ public class CmdWarunclaimall extends FCommand {
@Override @Override
public void perform() { public void perform() {
Board.getInstance().unclaimAll(Factions.getInstance().getWarZone().getId()); String worldName = argAsString(0);
msg(TL.COMMAND_WARUNCLAIMALL_SUCCESS); World world = null;
if (worldName != null) {
world = Bukkit.getWorld(worldName);
}
String id = Factions.getInstance().getWarZone().getId();
if (world == null) {
Board.getInstance().unclaimAll(id);
} else {
Board.getInstance().unclaimAllInWorld(id, world);
}
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {
P.p.log(TL.COMMAND_WARUNCLAIMALL_LOG.format(fme.getName())); P.p.log(TL.COMMAND_WARUNCLAIMALL_LOG.format(fme.getName()));

9
src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java
View File

@ -7,6 +7,7 @@ import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.util.AsciiCompass; import com.massivecraft.factions.util.AsciiCompass;
import com.massivecraft.factions.util.LazyLocation; import com.massivecraft.factions.util.LazyLocation;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.World;
import java.util.*; import java.util.*;
import java.util.Map.Entry; import java.util.Map.Entry;
@ -135,6 +136,14 @@ public abstract class MemoryBoard extends Board {
clean(factionId); clean(factionId);
} }
public void unclaimAllInWorld(String factionId, World world) {
for (FLocation loc : getAllClaims(factionId)) {
if (loc.getWorldName().equals(world.getName())) {
removeAt(loc);
}
}
}
public void clean(String factionId) { public void clean(String factionId) {
flocationIds.removeFaction(factionId); flocationIds.removeFaction(factionId);
} }