diff options
| author | Wesley Wolfe <weswolf@aol.com> | 2012-11-30 11:53:31 -0600 |
|---|---|---|
| committer | Wesley Wolfe <weswolf@aol.com> | 2012-11-30 11:59:29 -0600 |
| commit | 1a6a828156ceea6ac404006851790cf6af18fb95 (patch) | |
| tree | 84c5c0511d414bb54ebb268db609e76cfef1aa13 /src/main/java/net/minecraft/server | |
| parent | 9bd02495dfbd1d5cff9487c3b116ff0ef75c229d (diff) | |
| download | craftbukkit-1a6a828156ceea6ac404006851790cf6af18fb95.tar craftbukkit-1a6a828156ceea6ac404006851790cf6af18fb95.tar.gz craftbukkit-1a6a828156ceea6ac404006851790cf6af18fb95.tar.lz craftbukkit-1a6a828156ceea6ac404006851790cf6af18fb95.tar.xz craftbukkit-1a6a828156ceea6ac404006851790cf6af18fb95.zip | |
Add data values to EntityChangeBlockEvent. Adds BUKKIT-3077, BUKKIT-3076
This change affects Endermen and Silverfish, adding a data value for the block change event.
Diffstat (limited to 'src/main/java/net/minecraft/server')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityEnderman.java | 4 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/EntitySilverfish.java | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java index db88142f..eb331932 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -120,9 +120,7 @@ public class EntityEnderman extends EntityMonster { if (l == 0 && i1 > 0 && Block.byId[i1].b()) { // CraftBukkit start - place event - org.bukkit.block.Block bblock = this.world.getWorld().getBlockAt(i, j, k); - - if (!CraftEventFactory.callEntityChangeBlockEvent(this, bblock, this.getCarriedId()).isCancelled()) { + if (!CraftEventFactory.callEntityChangeBlockEvent(this, i, j, k, this.getCarriedId(), this.getCarriedData()).isCancelled()) { this.world.setTypeIdAndData(i, j, k, this.getCarriedId(), this.getCarriedData()); this.setCarriedId(0); } diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java index 1dab71b6..5ccb3ab6 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -94,7 +94,7 @@ public class EntitySilverfish extends EntityMonster { if (k1 == Block.MONSTER_EGGS.id) { // CraftBukkit start - if (CraftEventFactory.callEntityChangeBlockEvent(this, i + i1, j + l, k + j1, 0).isCancelled()) { + if (CraftEventFactory.callEntityChangeBlockEvent(this, i + i1, j + l, k + j1, 0, 0).isCancelled()) { continue; } // CraftBukkit end @@ -122,7 +122,7 @@ public class EntitySilverfish extends EntityMonster { l = this.world.getTypeId(i + Facing.b[l1], j + Facing.c[l1], k + Facing.d[l1]); if (BlockMonsterEggs.e(l)) { // CraftBukkit start - if (CraftEventFactory.callEntityChangeBlockEvent(this, i + Facing.b[l1], j + Facing.c[l1], k + Facing.d[l1], Block.MONSTER_EGGS.id).isCancelled()) { + if (CraftEventFactory.callEntityChangeBlockEvent(this, i + Facing.b[l1], j + Facing.c[l1], k + Facing.d[l1], Block.MONSTER_EGGS.id, BlockMonsterEggs.f(l)).isCancelled()) { return; } // CraftBukkit end |