diff options
| author | feildmaster <admin@feildmaster.com> | 2012-12-19 22:03:52 -0600 |
|---|---|---|
| committer | feildmaster <admin@feildmaster.com> | 2012-12-20 10:43:00 -0600 |
| commit | 23b67643741d5754af4de020a29d557078f9f81d (patch) | |
| tree | 90e1a32f7eb94af49a381cb6bc34bf6247f0efe6 /src/main/java/net/minecraft/server/Explosion.java | |
| parent | 9f1bf124eec7c20f16b2034fd9fba55f70c805fd (diff) | |
| download | craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.gz craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.lz craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.xz craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.zip | |
Update CraftBukkit to Minecraft 1.4.6
Diffstat (limited to 'src/main/java/net/minecraft/server/Explosion.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/Explosion.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java index fae57de1..ba2f88f0 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -144,10 +144,11 @@ public class Explosion { if (!event.isCancelled()) { damagee.setLastDamageCause(event); entity.damageEntity(DamageSource.EXPLOSION, event.getDamage()); + double d11 = EnchantmentProtection.a(entity, d10); - entity.motX += d0 * d10; - entity.motY += d1 * d10; - entity.motZ += d2 * d10; + entity.motX += d0 * d11; + entity.motY += d1 * d11; + entity.motZ += d2 * d11; if (entity instanceof EntityHuman) { this.l.put((EntityHuman) entity, this.world.getVec3DPool().create(d0 * d10, d1 * d10, d2 * d10)); } |