summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockFire.java
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-03-31 21:40:00 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-03-31 21:40:00 +0100
commit87c36febeb1801bc89ec040dd24db1ebac75ee36 (patch)
tree35bf16b0ebe4eb5ddb401d2e55391e3c85fc0f52 /src/main/java/net/minecraft/server/BlockFire.java
parent0635f7c1b8b03c67bd3aa1a85514f7535cdf9168 (diff)
downloadcraftbukkit-87c36febeb1801bc89ec040dd24db1ebac75ee36.tar
craftbukkit-87c36febeb1801bc89ec040dd24db1ebac75ee36.tar.gz
craftbukkit-87c36febeb1801bc89ec040dd24db1ebac75ee36.tar.lz
craftbukkit-87c36febeb1801bc89ec040dd24db1ebac75ee36.tar.xz
craftbukkit-87c36febeb1801bc89ec040dd24db1ebac75ee36.zip
Updated to Minecraft version 1.4
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockFire.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockFire.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
index 55af20f0..b3cfc9e8 100644
--- a/src/main/java/net/minecraft/server/BlockFire.java
+++ b/src/main/java/net/minecraft/server/BlockFire.java
@@ -166,13 +166,13 @@ public class BlockFire extends Block {
if (!world.isEmpty(i, j, k)) {
return 0;
} else {
- int l = this.g(world, i + 1, j, k, b0);
+ int l = this.f(world, i + 1, j, k, b0);
- l = this.g(world, i - 1, j, k, l);
- l = this.g(world, i, j - 1, k, l);
- l = this.g(world, i, j + 1, k, l);
- l = this.g(world, i, j, k - 1, l);
- l = this.g(world, i, j, k + 1, l);
+ l = this.f(world, i - 1, j, k, l);
+ l = this.f(world, i, j - 1, k, l);
+ l = this.f(world, i, j + 1, k, l);
+ l = this.f(world, i, j, k - 1, l);
+ l = this.f(world, i, j, k + 1, l);
return l;
}
}
@@ -185,7 +185,7 @@ public class BlockFire extends Block {
return this.a[iblockaccess.getTypeId(i, j, k)] > 0;
}
- public int g(World world, int i, int j, int k, int l) {
+ public int f(World world, int i, int j, int k, int l) {
int i1 = this.a[world.getTypeId(i, j, k)];
return i1 > l ? i1 : l;