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

Fixed some warnings.

Browse Source
This commit is contained in:
TomyLobo 2013-10-20 16:21:10 +02:00
parent 2fdc76a3f9
commit 9e708b70a9
2 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/main/java/com/sk89q/worldedit/ArbitraryShape.java
View File

@ -34,6 +34,7 @@ public abstract class ArbitraryShape {
private int cacheOffsetX; private int cacheOffsetX;
private int cacheOffsetY; private int cacheOffsetY;
private int cacheOffsetZ; private int cacheOffsetZ;
@SuppressWarnings("FieldCanBeLocal")
private int cacheSizeX; private int cacheSizeX;
private int cacheSizeY; private int cacheSizeY;
private int cacheSizeZ; private int cacheSizeZ;
@ -72,9 +73,9 @@ public abstract class ArbitraryShape {
/** /**
* Override this function to specify the shape to generate. * Override this function to specify the shape to generate.
* *
* @param x * @param x X coordinate to be queried
* @param y * @param y Y coordinate to be queried
* @param z * @param z Z coordinate to be queried
* @param defaultMaterial The material returned by the pattern for the current block. * @param defaultMaterial The material returned by the pattern for the current block.
* @return material to place or null to not place anything. * @return material to place or null to not place anything.
*/ */
@ -136,7 +137,7 @@ public abstract class ArbitraryShape {
/** /**
* Generates the shape. * Generates the shape.
* *
* @param editSession * @param editSession The EditSession to use.
* @param pattern The pattern to generate default materials from. * @param pattern The pattern to generate default materials from.
* @param hollow Specifies whether to generate a hollow shape. * @param hollow Specifies whether to generate a hollow shape.
* @return number of affected blocks. * @return number of affected blocks.
@ -164,38 +165,36 @@ public abstract class ArbitraryShape {
continue; continue;
} }
if (hollow) { boolean draw = false;
boolean draw = false; do {
do { if (!isInsideCached(x + 1, y, z, pattern)) {
if (!isInsideCached(x + 1, y, z, pattern)) { draw = true;
draw = true; break;
break;
}
if (!isInsideCached(x - 1, y, z, pattern)) {
draw = true;
break;
}
if (!isInsideCached(x, y + 1, z, pattern)) {
draw = true;
break;
}
if (!isInsideCached(x, y - 1, z, pattern)) {
draw = true;
break;
}
if (!isInsideCached(x, y, z + 1, pattern)) {
draw = true;
break;
}
if (!isInsideCached(x, y, z - 1, pattern)) {
draw = true;
break;
}
} while (false);
if (!draw) {
continue;
} }
if (!isInsideCached(x - 1, y, z, pattern)) {
draw = true;
break;
}
if (!isInsideCached(x, y + 1, z, pattern)) {
draw = true;
break;
}
if (!isInsideCached(x, y - 1, z, pattern)) {
draw = true;
break;
}
if (!isInsideCached(x, y, z + 1, pattern)) {
draw = true;
break;
}
if (!isInsideCached(x, y, z - 1, pattern)) {
draw = true;
break;
}
} while (false);
if (!draw) {
continue;
} }
if (editSession.setBlock(position, material)) { if (editSession.setBlock(position, material)) {

2
src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java
View File

@ -269,7 +269,7 @@ public class GenerationCommands {
int size = args.argsLength() > 0 ? Math.max(1, args.getInteger(0)) : 10; int size = args.argsLength() > 0 ? Math.max(1, args.getInteger(0)) : 10;
TreeGenerator.TreeType type = args.argsLength() > 1 ? TreeGenerator.TreeType type = args.argsLength() > 1 ?
type = TreeGenerator.lookup(args.getString(1)) TreeGenerator.lookup(args.getString(1))
: TreeGenerator.TreeType.TREE; : TreeGenerator.TreeType.TREE;
double density = args.argsLength() > 2 ? args.getDouble(2) / 100 : 0.05; double density = args.argsLength() > 2 ? args.getDouble(2) / 100 : 0.05;