Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-01-18 14:11:30 +01:00
Code Issues Projects Releases Wiki Activity

Fixed the volume calculation on Polygonal regions

Browse Source
This commit is contained in:
Dark Arc 2013-06-20 23:31:02 -04:00 committed by TomyLobo
parent 4422d536b7
commit f08a9a4aa4
2 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java
View File

@ -25,6 +25,7 @@
import java.util.List;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
@ -698,6 +699,8 @@ public void info(CommandContext args, CommandSender sender) throws CommandExcept
existing = findExistingRegion(regionManager, args.getString(0), true);
}
Bukkit.getLogger().info(String.valueOf(existing.volume()));
// Check permissions
if (!permModel.mayLookup(existing)) {
throw new CommandPermissionsException();

45
src/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java
View File

@ -158,41 +158,30 @@ public String getTypeName() {
@Override
public int volume() {
int volume = 0;
// TODO: Fix this
/*int numPoints = points.size();
int yLength = max.getBlockY() - min.getBlockY() + 1;
int numPoints = points.size();
if (numPoints < 3) {
return 0;
int xLength = max.getBlockX() - min.getBlockX() + 1;
int zLength = max.getBlockZ() - min.getBlockZ() + 1;
return xLength * yLength * zLength;
}
double area = 0;
int xa, z1, z2;
int area = 0;
BlockVector2D p1, p2;
int s = numPoints - 1;
for (int i = 0; i < numPoints; i++) {
xa = points.get(i).getBlockX();
//za = points.get(i).getBlockZ();
if (points.get(i + 1) == null) {
z1 = points.get(0).getBlockZ();
} else {
z1 = points.get(i + 1).getBlockZ();
}
if (points.get(i - 1) == null) {
z2 = points.get(numPoints - 1).getBlockZ();
} else {
z2 = points.get(i - 1).getBlockZ();
}
// Update/define p1 & p2
p1 = points.get(i);
p2 = points.get(s);
area = area + (xa * (z1 - z2));
// Do the math, then reassign s
area += (p2.getBlockX() + p1.getBlockX()) * (p2.getBlockZ() - p1.getBlockZ());
s = i;
}
xa = points.get(0).getBlockX();
//za = points.get(0).getBlockZ();
area = area + (xa * (points.get(1).getBlockZ() - points.get(numPoints - 1).getBlockZ()));
volume = (Math.abs(maxY - minY) + 1) * (int) Math.ceil((Math.abs(area) / 2));*/
return volume;
return (int) Math.abs(Math.ceil(area / 2D) * yLength);
}
}