summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2012-03-09 12:08:59 -0500
committerEvilSeph <evilseph@gmail.com>2012-03-09 12:08:59 -0500
commit45cf9274463d7465b45764c140499f19c5d1d933 (patch)
tree48acf1c6602b84a2c311a9caa616c5a6dc94d75d
parenta602d5c8c1eb93671fd9073291dff8ea89db1bd8 (diff)
downloadcraftbukkit-45cf9274463d7465b45764c140499f19c5d1d933.tar
craftbukkit-45cf9274463d7465b45764c140499f19c5d1d933.tar.gz
craftbukkit-45cf9274463d7465b45764c140499f19c5d1d933.tar.lz
craftbukkit-45cf9274463d7465b45764c140499f19c5d1d933.tar.xz
craftbukkit-45cf9274463d7465b45764c140499f19c5d1d933.zip
(Re)restricted the nether to 128 world height. Fixes BUKKIT-976
-rw-r--r--src/main/java/net/minecraft/server/PortalTravelAgent.java6
-rw-r--r--src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
index be3c2b78..e75220af 100644
--- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
@@ -66,7 +66,7 @@ public class PortalTravelAgent {
for (int k1 = i1 - short1; k1 <= i1 + short1; ++k1) {
double d3 = (double) k1 + 0.5D - entity.locZ;
- for (int l1 = 255; l1 >= 0; --l1) { // CraftBukkit - 127 -> 255
+ for (int l1 = 127; l1 >= 0; --l1) {
if (world.getTypeId(j1, l1, k1) == Block.PORTAL.id) {
while (world.getTypeId(j1, l1 - 1, k1) == Block.PORTAL.id) {
--l1;
@@ -150,7 +150,7 @@ public class PortalTravelAgent {
d2 = (double) j2 + 0.5D - entity.locZ;
label274:
- for (l2 = 255; l2 >= 0; --l2) { // CraftBukkit - 127 -> 255
+ for (l2 = 127; l2 >= 0; --l2) {
if (world.isEmpty(i2, l2, j2)) {
while (l2 > 0 && world.isEmpty(i2, l2 - 1, j2)) {
--l2;
@@ -201,7 +201,7 @@ public class PortalTravelAgent {
d2 = (double) j2 + 0.5D - entity.locZ;
label222:
- for (l2 = 255; l2 >= 0; --l2) { // CraftBukkit - 127 -> 255
+ for (l2 = 127; l2 >= 0; --l2) {
if (world.isEmpty(i2, l2, j2)) {
while (l2 > 0 && world.isEmpty(i2, l2 - 1, j2)) {
--l2;
diff --git a/src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java b/src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java
index 72cc84e1..495c586a 100644
--- a/src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java
+++ b/src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java
@@ -87,7 +87,7 @@ public class PortalTravelAgent implements TravelAgent {
for (int k1 = i1 - this.searchRadius; k1 <= i1 + this.searchRadius; ++k1) {
double d3 = (double) k1 + 0.5D - location.getZ();
- for (int l1 = 255; l1 >= 0; --l1) {
+ for (int l1 = 127; l1 >= 0; --l1) {
if (world.getTypeId(j1, l1, k1) == Block.PORTAL.id) {
while (world.getTypeId(j1, l1 - 1, k1) == Block.PORTAL.id) {
--l1;
@@ -194,7 +194,7 @@ public class PortalTravelAgent implements TravelAgent {
d2 = (double) j2 + 0.5D - location.getZ();
label271:
- for (l2 = 255; l2 >= 0; --l2) {
+ for (l2 = 127; l2 >= 0; --l2) {
if (world.isEmpty(i2, l2, j2)) {
while (l2 > 0 && world.isEmpty(i2, l2 - 1, j2)) {
--l2;
@@ -245,7 +245,7 @@ public class PortalTravelAgent implements TravelAgent {
d2 = (double) j2 + 0.5D - location.getZ();
label219:
- for (l2 = 255; l2 >= 0; --l2) {
+ for (l2 = 127; l2 >= 0; --l2) {
if (world.isEmpty(i2, l2, j2)) {
while (l2 > 0 && world.isEmpty(i2, l2 - 1, j2)) {
--l2;