Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-23 09:27:45 +01:00
Code Issues Projects Releases Wiki Activity

Updated from 1.2.2 to 1.2.3. This fixes BUKKIT-943

Browse Source
This commit is contained in:
Nathan Adams 2012-03-02 19:31:06 +00:00
parent cb669f72a0
commit a42e710bbc
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<packaging>jar</packaging>
<version>1.2.2-R0.1-SNAPSHOT</version>
<version>1.2.3-R0.1-SNAPSHOT</version>
<name>CraftBukkit</name>
<url>http://www.bukkit.org</url>
@ -51,7 +51,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.2.2-R0.1-SNAPSHOT</version>
<version>1.2.3-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>

2
src/main/java/net/minecraft/server/Chunk.java
View File

@ -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) {

4
src/main/java/net/minecraft/server/MinecraftServer.java
View File

@ -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() {

2
src/main/java/net/minecraft/server/World.java
View File

@ -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);
}
}

6
src/main/java/net/minecraft/server/WorldGenForest.java
View File

@ -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;

6
src/main/java/net/minecraft/server/WorldGenTaiga2.java
View File

@ -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;