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

Clean up some stray 128 values and update the defaults

Browse Source
This commit is contained in:
zml2008 2012-03-01 20:47:19 -08:00
parent 87e40141c6
commit 373e4b90c9
5 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -49,7 +49,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.1-R5-SNAPSHOT</version> <version>1.1-R6</version>
</dependency> </dependency>
<!-- Archive reading library for snapshots --> <!-- Archive reading library for snapshots -->

6
src/main/java/com/sk89q/worldedit/LocalPlayer.java
View File

@ -77,7 +77,7 @@ public abstract class LocalPlayer {
byte free = 0; byte free = 0;
while (y <= 129) { while (y <= world.getMaxY() + 2) {
if (BlockType.canPassThrough(world.getBlockType(new Vector(x, y, z)))) { if (BlockType.canPassThrough(world.getBlockType(new Vector(x, y, z)))) {
++free; ++free;
} else { } else {
@ -142,7 +142,7 @@ public abstract class LocalPlayer {
byte free = 0; byte free = 0;
byte spots = 0; byte spots = 0;
while (y <= 129) { while (y <= world.getMaxY() + 2) {
if (BlockType.canPassThrough(world.getBlockType(new Vector(x, y, z)))) { if (BlockType.canPassThrough(world.getBlockType(new Vector(x, y, z)))) {
++free; ++free;
} else { } else {
@ -266,7 +266,7 @@ public abstract class LocalPlayer {
int maxY = Math.min(getWorld().getMaxY() + 1, initialY + distance); int maxY = Math.min(getWorld().getMaxY() + 1, initialY + distance);
LocalWorld world = getPosition().getWorld(); LocalWorld world = getPosition().getWorld();
while (y <= 129) { while (y <= world.getMaxY() + 2) {
if (!BlockType.canPassThrough(world.getBlockType(new Vector(x, y, z)))) { if (!BlockType.canPassThrough(world.getBlockType(new Vector(x, y, z)))) {
break; // Hit something break; // Hit something
} else if (y > maxY + 1) { } else if (y > maxY + 1) {

2
src/main/java/com/sk89q/worldedit/LocalWorld.java
View File

@ -370,7 +370,7 @@ public abstract class LocalWorld {
* @return * @return
*/ */
public int getMaxY() { public int getMaxY() {
return 127; return 255;
} }
/** /**

4
src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java
View File

@ -239,8 +239,8 @@ public class CuboidRegion extends AbstractRegion {
} }
private void recalculate() { private void recalculate() {
pos1 = pos1.clampY(0, world == null ? 127 : world.getMaxY()); pos1 = pos1.clampY(0, world == null ? 255 : world.getMaxY());
pos2 = pos2.clampY(0, world == null ? 127 : world.getMaxY()); pos2 = pos2.clampY(0, world == null ? 255 : world.getMaxY());
} }
@Override @Override

4
src/main/java/com/sk89q/worldedit/regions/Polygonal2DRegion.java
View File

@ -123,8 +123,8 @@ public class Polygonal2DRegion extends AbstractRegion {
minY = Math.min(oldMinY, oldMaxY); minY = Math.min(oldMinY, oldMaxY);
maxY = Math.max(oldMinY, oldMaxY); maxY = Math.max(oldMinY, oldMaxY);
minY = Math.min(Math.max(0, minY), world == null ? 127 : world.getMaxY()); minY = Math.min(Math.max(0, minY), world == null ? 255 : world.getMaxY());
maxY = Math.min(Math.max(0, maxY), world == null ? 127 : world.getMaxY()); maxY = Math.min(Math.max(0, maxY), world == null ? 255 : world.getMaxY());
min = new BlockVector(minX, minY, minZ); min = new BlockVector(minX, minY, minZ);
max = new BlockVector(maxX, maxY, maxZ); max = new BlockVector(maxX, maxY, maxZ);