From a42e710bbc7c3e694b059145725ff3232f771f13 Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Fri, 2 Mar 2012 19:31:06 +0000 Subject: Updated from 1.2.2 to 1.2.3. This fixes BUKKIT-943 --- src/main/java/net/minecraft/server/Chunk.java | 2 +- src/main/java/net/minecraft/server/MinecraftServer.java | 4 ++-- src/main/java/net/minecraft/server/World.java | 2 +- src/main/java/net/minecraft/server/WorldGenForest.java | 6 +++--- src/main/java/net/minecraft/server/WorldGenTaiga2.java | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/main/java/net') diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java index 1d775db9..34887c39 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -554,7 +554,7 @@ public class Chunk { } public boolean d(int i, int j, int k) { - return j > this.heightMap[k << 4 | i]; + return j >= this.heightMap[k << 4 | i]; } public TileEntity e(int i, int j, int k) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index a0287ac5..36ebf8a0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -112,7 +112,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe System.setErr(new PrintStream(new LoggerOutputStream(log, Level.SEVERE), true)); // CraftBukkit end - log.info("Starting minecraft server version 1.2.2"); + log.info("Starting minecraft server version 1.2.3"); if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) { log.warning("**** NOT ENOUGH RAM!"); log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); @@ -685,7 +685,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe } public String getVersion() { - return "1.2.2"; + return "1.2.3"; } public int getPlayerCount() { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index e0ca78ab..27790fa2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2284,7 +2284,7 @@ public class World implements IBlockAccess { i5 = 1; } - if (l2 == k2 - i5 && i1 < this.E.length) { // CraftBukkit - <= to < + if (l2 == k2 - i5 && i1 < this.E.length) { this.E[i1++] = j4 - i + 32 + (k4 - j + 32 << 6) + (l4 - k + 32 << 12) + (k2 - i5 << 18); } } diff --git a/src/main/java/net/minecraft/server/WorldGenForest.java b/src/main/java/net/minecraft/server/WorldGenForest.java index e52f535b..0ea716f7 100644 --- a/src/main/java/net/minecraft/server/WorldGenForest.java +++ b/src/main/java/net/minecraft/server/WorldGenForest.java @@ -24,7 +24,7 @@ public class WorldGenForest extends WorldGenerator { int l = random.nextInt(3) + 5; boolean flag = true; - if (j >= 1 && j + l + 1 <= 128) { + if (j >= 1 && j + l + 1 <= 256) { int i1; int j1; int k1; @@ -43,7 +43,7 @@ public class WorldGenForest extends WorldGenerator { for (j1 = i - b0; j1 <= i + b0 && flag; ++j1) { for (k1 = k - b0; k1 <= k + b0 && flag; ++k1) { - if (i1 >= 0 && i1 < 128) { + if (i1 >= 0 && i1 < 256) { l1 = world.getTypeId(j1, i1, k1); if (l1 != 0 && l1 != Block.LEAVES.id) { flag = false; @@ -59,7 +59,7 @@ public class WorldGenForest extends WorldGenerator { return false; } else { i1 = world.getTypeId(i, j - 1, k); - if ((i1 == Block.GRASS.id || i1 == Block.DIRT.id) && j < 128 - l - 1) { + if ((i1 == Block.GRASS.id || i1 == Block.DIRT.id) && j < 256 - l - 1) { world.setRawTypeId(i, j - 1, k, Block.DIRT.id); int i2; diff --git a/src/main/java/net/minecraft/server/WorldGenTaiga2.java b/src/main/java/net/minecraft/server/WorldGenTaiga2.java index de9ce6ba..34367ab9 100644 --- a/src/main/java/net/minecraft/server/WorldGenTaiga2.java +++ b/src/main/java/net/minecraft/server/WorldGenTaiga2.java @@ -27,7 +27,7 @@ public class WorldGenTaiga2 extends WorldGenerator { int k1 = 2 + random.nextInt(2); boolean flag = true; - if (j >= 1 && j + l + 1 <= 128) { + if (j >= 1 && j + l + 1 <= 256) { int l1; int i2; int j2; @@ -44,7 +44,7 @@ public class WorldGenTaiga2 extends WorldGenerator { for (i2 = i - k2; i2 <= i + k2 && flag; ++i2) { for (int l2 = k - k2; l2 <= k + k2 && flag; ++l2) { - if (l1 >= 0 && l1 < 128) { + if (l1 >= 0 && l1 < 256) { j2 = world.getTypeId(i2, l1, l2); if (j2 != 0 && j2 != Block.LEAVES.id) { flag = false; @@ -60,7 +60,7 @@ public class WorldGenTaiga2 extends WorldGenerator { return false; } else { l1 = world.getTypeId(i, j - 1, k); - if ((l1 == Block.GRASS.id || l1 == Block.DIRT.id) && j < 128 - l - 1) { + if ((l1 == Block.GRASS.id || l1 == Block.DIRT.id) && j < 256 - l - 1) { world.setRawTypeId(i, j - 1, k, Block.DIRT.id); k2 = random.nextInt(2); i2 = 1; -- cgit v1.2.3