EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Various

Browse Source 
- Fix some block change issues (for some reason sending a chunk would
sometimes reset any recent changes)
- Send chunk changes for relight command
- Have kick cmd kick the player from the server if they are kicked from
the spawn plot
- Plot size checks for downloading
- Fix some potential integer overflow issues for large plots (>64K x
64K)
- Fix some edge cases for plot move/copy
This commit is contained in:
Jesse Boyd
2016-03-31 20:48:46 +11:00
parent dbdd9f9e5a
commit edd18a7178
15 changed files with 151 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java
View File

@ -394,6 +394,8 @@ public class Area extends SubCommand {
}, "/plot area list", C.AREA_LIST_HEADER_PAGED.s());
return true;
case "regen":
case "clear":
case "reset":
case "regenerate": {
if (!Permissions.hasPermission(plr, "plots.area.regen")) {
C.NO_PERMISSION.send(plr, "plots.area.regen");

8
Core/src/main/java/com/intellectualcrafters/plot/commands/Download.java
View File

@ -51,6 +51,10 @@ public class Download extends SubCommand {
return false;
}
if (args.length == 0 || (args.length == 1 && StringMan.isEqualIgnoreCaseToAny(args[0], "sch", "schem", "schematic"))) {
if (plot.getVolume() > 512d * 512d * 256d) {
C.SCHEMATIC_TOO_LARGE.send(plr);
return false;
}
plot.addRunning();
SchematicHandler.manager.getCompoundTag(plot, new RunnableVal<CompoundTag>() {
@Override
@ -72,6 +76,10 @@ public class Download extends SubCommand {
if (!Permissions.hasPermission(plr, "plots.download.bo3")) {
C.NO_PERMISSION.send(plr, "plots.download.bo3");
}
if (plot.getVolume() > 128d * 128d * 256) {
C.SCHEMATIC_TOO_LARGE.send(plr);
return false;
}
plot.addRunning();
BO3Handler.upload(plot, null, null, new RunnableVal<URL>() {
@Override

14
Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java
View File

@ -49,7 +49,19 @@ public class Kick extends SubCommand {
C.CANNOT_KICK_PLAYER.send(plr, player.getName());
return false;
}
player.teleport(WorldUtil.IMP.getSpawn(loc.getWorld()));
Location spawn = WorldUtil.IMP.getSpawn(loc.getWorld());
C.YOU_GOT_KICKED.send(player);
if (plot.equals(spawn.getPlot())) {
Location newSpawn = WorldUtil.IMP.getSpawn(player);
if (plot.equals(newSpawn.getPlot())) {
// Kick from server if you can't be teleported to spawn
player.kick(C.YOU_GOT_KICKED.s());
} else {
player.teleport(newSpawn);
}
} else {
player.teleport(spawn);
}
return true;
}
}

1
Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java
View File

@ -38,6 +38,7 @@ public class Relight extends Command {
}, new Runnable() {
@Override
public void run() {
plot.refreshChunks();
C.SET_BLOCK_ACTION_FINISHED.send(player);
}
}, 5);

5
Core/src/main/java/com/intellectualcrafters/plot/config/C.java
View File

@ -271,6 +271,7 @@ public enum C {
/*
* Schematic Stuff
*/
SCHEMATIC_TOO_LARGE("$2The plot is too large for this action!", "Schematics"),
SCHEMATIC_MISSING_ARG("$2You need to specify an argument. Possible values: $1test <name>$2 , $1save$2 , $1paste $2, $1exportall", "Schematics"),
SCHEMATIC_INVALID("$2That is not a valid schematic. Reason: $2%s", "Schematics"),
SCHEMATIC_VALID("$2That is a valid schematic", "Schematics"),
@ -535,6 +536,10 @@ public enum C {
DENIED_NEED_ARGUMENT("$2Arguments are missing. $1/plot denied add <name> $2or $1/plot denied remove <name>", "Deny"),
WAS_NOT_DENIED("$2That player was not denied on this plot", "Deny"),
YOU_GOT_DENIED("$4You are denied from the plot you were previously on, and got teleported to spawn", "Deny"),
/*
* Kick
*/
YOU_GOT_KICKED("$4You got kicked!", "Kick"),
/*
* Rain
*/

1
Core/src/main/java/com/intellectualcrafters/plot/flag/FlagValue.java
View File

@ -438,7 +438,6 @@ public abstract class FlagValue<T> {
@Override
public List<String> parse(final String t) {
System.out.println("PARSE: " + t);
return new ArrayList<>(Arrays.asList(t.split(",")));
}

79
Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
View File

@ -20,7 +20,6 @@ import com.intellectualcrafters.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.UUIDHandler;
import com.intellectualcrafters.plot.util.WorldUtil;
import com.plotsquared.listener.PlotListener;
import java.awt.Rectangle;
import java.awt.geom.Area;
import java.awt.geom.PathIterator;
@ -777,23 +776,14 @@ public class Plot {
TaskManager.runTask(whenDone);
}
};
if (isDelete) {
for (Plot current : plots) {
manager.unclaimPlot(Plot.this.area, current, new Runnable() {
@Override
public void run() {
if (finished.incrementAndGet() >= plots.size()) {
run.run();
}
}
});
}
} else {
for (Plot current : plots) {
for (Plot current : plots) {
if (isDelete || current.owner == null) {
manager.unclaimPlot(Plot.this.area, current, null);
} else {
manager.claimPlot(Plot.this.area, current);
}
SetQueue.IMP.addTask(run);
}
SetQueue.IMP.addTask(run);
return;
}
Plot current = queue.poll();
@ -804,7 +794,16 @@ public class Plot {
manager.clearPlot(Plot.this.area, current, this);
}
};
run.run();
if (!isMerged() && area.getRegion().equals(getLargestRegion())) {
ChunkManager.largeRegionTask(area.worldname, area.getRegion(), new RunnableVal<ChunkLoc>() {
@Override
public void run(ChunkLoc value) {
ChunkManager.manager.regenerateChunk(area.worldname, value);
}
}, whenDone);
} else {
run.run();
}
return true;
}
@ -1137,8 +1136,8 @@ public class Plot {
if (this.area.DEFAULT_HOME.x == Integer.MAX_VALUE && this.area.DEFAULT_HOME.z == Integer.MAX_VALUE) {
// center
RegionWrapper largest = plot.getLargestRegion();
x = (largest.maxX - largest.minX) / 2 + largest.minX;
z = (largest.maxZ - largest.minZ) / 2 + largest.minZ;
x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
z = (largest.maxZ >> 1) - (largest.minZ >> 1) + largest.minZ;
} else {
// specific
Location bot = plot.getBottomAbs();
@ -1150,13 +1149,21 @@ public class Plot {
}
// Side
RegionWrapper largest = plot.getLargestRegion();
int x = (largest.maxX - largest.minX) / 2 + largest.minX;
int x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
int z = largest.minZ - 1;
PlotManager manager = plot.getManager();
int y = Math.max(WorldUtil.IMP.getHighestBlock(plot.area.worldname, x, z), manager.getSignLoc(plot.area, plot).getY());
return new Location(plot.area.worldname, x, y + 1, z);
}
public double getVolume() {
double count = 0;
for (RegionWrapper region : getRegions()) {
count += (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1) * 256;
}
return count;
}
/**
* Get the average rating of the plot. This is the value displayed in /plot info
* @return average rating as double
@ -2201,6 +2208,10 @@ public class Plot {
return this.area.getPlotAbs(this.id.getRelative(x, y));
}
public Plot getRelative(PlotArea area, int x, int y) {
return area.getPlotAbs(this.id.getRelative(x, y));
}
/**
* Get the plot in a relative direction<br>
* 0 = north<br>
@ -2470,9 +2481,9 @@ public class Plot {
public RegionWrapper getLargestRegion() {
HashSet<RegionWrapper> regions = this.getRegions();
RegionWrapper max = null;
int area = 0;
double area = Double.NEGATIVE_INFINITY;
for (RegionWrapper region : regions) {
int current = (region.maxX - region.minX + 1) * (region.maxZ - region.minZ + 1);
double current = ((region.maxX - (double) region.minX + 1)) * (region.maxZ - (double) region.minZ + 1);
if (current > area) {
max = region;
area = current;
@ -2680,7 +2691,7 @@ public class Plot {
* @return
*/
public boolean move(final Plot destination, final Runnable whenDone, boolean allowSwap) {
PlotId offset = new PlotId(destination.getId().x - this.getId().x, destination.getId().y - this.getId().y);
final PlotId offset = new PlotId(destination.getId().x - this.getId().x, destination.getId().y - this.getId().y);
Location db = destination.getBottomAbs();
Location ob = this.getBottomAbs();
final int offsetX = db.getX() - ob.getX();
@ -2692,21 +2703,24 @@ public class Plot {
boolean occupied = false;
HashSet<Plot> plots = this.getConnectedPlots();
for (Plot plot : plots) {
Plot other = plot.getRelative(offset.x, offset.y);
Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
if (other.hasOwner()) {
if (!allowSwap) {
TaskManager.runTaskLater(whenDone, 1);
return false;
}
occupied = true;
} else {
plot.removeSign();
}
}
// world border
destination.updateWorldBorder();
final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
// move / swap data
final PlotArea originArea = getArea();
for (Plot plot : plots) {
Plot other = plot.getRelative(offset.x, offset.y);
Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
plot.swapData(other, null);
}
// copy terrain
@ -2714,6 +2728,13 @@ public class Plot {
@Override
public void run() {
if (regions.isEmpty()) {
Plot plot = destination.getRelative(0, 0);
for (Plot current : plot.getConnectedPlots()) {
getManager().claimPlot(current.getArea(), current);
Plot originPlot = originArea.getPlotAbs(new PlotId(current.id.x - offset.x, current.id.y - offset.y));
originPlot.getManager().unclaimPlot(originArea, originPlot, null);
}
plot.setSign();
TaskManager.runTask(whenDone);
return;
}
@ -2728,7 +2749,7 @@ public class Plot {
@Override
public void run() {
ChunkManager.manager.regenerateRegion(pos1, pos2, false, task);
}
}
});
}
};
@ -2776,7 +2797,7 @@ public class Plot {
}
HashSet<Plot> plots = this.getConnectedPlots();
for (Plot plot : plots) {
Plot other = plot.getRelative(offset.x, offset.y);
Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
if (other.hasOwner()) {
TaskManager.runTaskLater(whenDone, 1);
return false;
@ -2786,7 +2807,7 @@ public class Plot {
destination.updateWorldBorder();
// copy data
for (Plot plot : plots) {
Plot other = plot.getRelative(offset.x, offset.y);
Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
other.create(plot.owner, false);
if (!plot.getFlags().isEmpty()) {
other.getSettings().flags = plot.getFlags();
@ -2820,6 +2841,10 @@ public class Plot {
@Override
public void run() {
if (regions.isEmpty()) {
for (Plot current : getConnectedPlots()) {
destination.getManager().claimPlot(destination.getArea(), destination);
}
destination.setSign();
TaskManager.runTask(whenDone);
return;
}

5
Core/src/main/java/com/intellectualcrafters/plot/util/WorldUtil.java
View File

@ -4,6 +4,7 @@ import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotBlock;
import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.RegionWrapper;
import com.intellectualcrafters.plot.object.RunnableVal;
import com.intellectualcrafters.plot.object.schematic.PlotItem;
@ -29,9 +30,11 @@ public abstract class WorldUtil {
public abstract boolean isWorld(String worldName);
public abstract String[] getSign(Location location);
public abstract Location getSpawn(String world);
public abstract Location getSpawn(PlotPlayer pp);
public abstract void setSpawn(Location location);
public abstract void saveWorld(String world);