twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-11 18:22:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update for 1.4_00_01 -- if you bypassed Bukkit, you will most likely break.

Browse Source
This commit is contained in:
Erik Broes
2011-04-20 19:05:14 +02:00
parent ac9f297445
commit 483a878b8b
116 changed files with 3155 additions and 3207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/net/minecraft/server/BlockCactus.java
View File

@@ -28,10 +28,10 @@ public class BlockCactus extends Block {
int i1 = world.getData(i, j, k);
if (i1 == 15) {
world.e(i, j + 1, k, this.id);
world.c(i, j, k, 0);
world.setTypeId(i, j + 1, k, this.id);
world.setData(i, j, k, 0);
} else {
world.c(i, j, k, i1 + 1);
world.setData(i, j, k, i1 + 1);
}
}
}
@@ -51,14 +51,14 @@ public class BlockCactus extends Block {
return false;
}
public boolean a(World world, int i, int j, int k) {
return !super.a(world, i, j, k) ? false : this.f(world, i, j, k);
public boolean canPlace(World world, int i, int j, int k) {
return !super.canPlace(world, i, j, k) ? false : this.f(world, i, j, k);
}
public void a(World world, int i, int j, int k, int l) {
public void doPhysics(World world, int i, int j, int k, int l) {
if (!this.f(world, i, j, k)) {
this.a_(world, i, j, k, world.getData(i, j, k));
world.e(i, j, k, 0);
world.setTypeId(i, j, k, 0);
}
}
@@ -91,11 +91,11 @@ public class BlockCactus extends Block {
server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
entity.a((Entity) null, event.getDamage());
entity.damageEntity((Entity) null, event.getDamage());
}
return;
}
// CraftBukkit end
entity.a((Entity) null, 1);
entity.damageEntity((Entity) null, 1);
}
}