Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-03 15:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make //setbiome respect global mask, if set to a biome mask

Browse Source
This commit is contained in:
wizjany 2013-03-28 19:53:42 -04:00
parent e7d55ca87d
commit 2846119f08
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/sk89q/worldedit/commands/BiomeCommands.java
View File

@ -19,6 +19,9 @@ import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.masks.BiomeTypeMask;
import com.sk89q.worldedit.masks.InvertedMask;
import com.sk89q.worldedit.masks.Mask;
import com.sk89q.worldedit.regions.FlatRegion; import com.sk89q.worldedit.regions.FlatRegion;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;
@ -138,10 +141,24 @@ public class BiomeCommands {
return; return;
} }
Mask mask = editSession.getMask();
BiomeTypeMask biomeMask = null;
boolean inverted = false;
if (mask instanceof BiomeTypeMask) {
biomeMask = (BiomeTypeMask) mask;
} else if (mask instanceof InvertedMask && ((InvertedMask) mask).getInvertedMask() instanceof BiomeTypeMask) {
inverted = true;
biomeMask = (BiomeTypeMask) ((InvertedMask) mask).getInvertedMask();
}
if (args.hasFlag('p')) { if (args.hasFlag('p')) {
Vector2D pos = player.getPosition().toVector2D(); Vector2D pos = player.getPosition().toVector2D();
player.getWorld().setBiome(pos, target); if (biomeMask != null && (biomeMask.matches2D(editSession, pos) ^ inverted)) {
player.print("Biome changed to " + target.getName() + " at your current location."); player.getWorld().setBiome(pos, target);
player.print("Biome changed to " + target.getName() + " at your current location.");
} else {
player.print("Your global mask doesn't match this biome. Type //gmask to disable it.");
}
} else { } else {
int affected = 0; int affected = 0;
LocalWorld world = player.getWorld(); LocalWorld world = player.getWorld();
@ -149,16 +166,20 @@ public class BiomeCommands {
if (region instanceof FlatRegion) { if (region instanceof FlatRegion) {
for (Vector2D pt : ((FlatRegion) region).asFlatRegion()) { for (Vector2D pt : ((FlatRegion) region).asFlatRegion()) {
world.setBiome(pt, target); if (biomeMask != null && (biomeMask.matches2D(editSession, pt) ^ inverted)) {
++affected; world.setBiome(pt, target);
++affected;
}
} }
} else { } else {
HashSet<Long> alreadyVisited = new HashSet<Long>(); HashSet<Long> alreadyVisited = new HashSet<Long>();
for (Vector pt : region) { for (Vector pt : region) {
if (!alreadyVisited.contains((long)pt.getBlockX() << 32 | pt.getBlockZ())) { if (!alreadyVisited.contains((long)pt.getBlockX() << 32 | pt.getBlockZ())) {
alreadyVisited.add(((long)pt.getBlockX() << 32 | pt.getBlockZ())); alreadyVisited.add(((long)pt.getBlockX() << 32 | pt.getBlockZ()));
world.setBiome(pt.toVector2D(), target); if (biomeMask != null && (biomeMask.matches(editSession, pt) ^ inverted)) {
++affected; world.setBiome(pt.toVector2D(), target);
++affected;
}
} }
} }
} }

9
src/main/java/com/sk89q/worldedit/masks/BiomeTypeMask.java
View File

@ -8,6 +8,7 @@ import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalPlayer; import com.sk89q.worldedit.LocalPlayer;
import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.Vector2D;
public class BiomeTypeMask implements Mask { public class BiomeTypeMask implements Mask {
@ -24,9 +25,13 @@ public class BiomeTypeMask implements Mask {
public void prepare(LocalSession session, LocalPlayer player, Vector target) { public void prepare(LocalSession session, LocalPlayer player, Vector target) {
} }
public boolean matches(EditSession editSession, Vector pos) { public boolean matches2D(EditSession editSession, Vector2D pos) {
BiomeType biome = editSession.getWorld().getBiome(pos.toVector2D()); BiomeType biome = editSession.getWorld().getBiome(pos);
return biomes.contains(biome); return biomes.contains(biome);
} }
public boolean matches(EditSession editSession, Vector pos) {
return matches2D(editSession, pos.toVector2D());
}
} }

3
src/main/java/com/sk89q/worldedit/masks/InvertedMask.java
View File

@ -22,4 +22,7 @@ public class InvertedMask implements Mask {
return !mask.matches(editSession, pos); return !mask.matches(editSession, pos);
} }
public Mask getInvertedMask() {
return mask;
}
} }