summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorMike Primm <mike@primmhome.com>2012-03-09 23:59:13 -0600
committerEvilSeph <evilseph@gmail.com>2012-03-10 18:36:27 -0500
commiteaa56941f3fa8b6c3a44c6239b3293107e54ae4a (patch)
tree9d251b553eacc264b2dcd75664fe9cb68ec07a31 /src/main/java
parent996832ff6c3d410e21bab149cf6197799468d6cd (diff)
downloadcraftbukkit-eaa56941f3fa8b6c3a44c6239b3293107e54ae4a.tar
craftbukkit-eaa56941f3fa8b6c3a44c6239b3293107e54ae4a.tar.gz
craftbukkit-eaa56941f3fa8b6c3a44c6239b3293107e54ae4a.tar.lz
craftbukkit-eaa56941f3fa8b6c3a44c6239b3293107e54ae4a.tar.xz
craftbukkit-eaa56941f3fa8b6c3a44c6239b3293107e54ae4a.zip
[Bleeding] Make zero (or very small) explosions do no damage. Fixes BUKKIT-931
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/net/minecraft/server/Explosion.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index 469bfe5a..e4ba3207 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -33,13 +33,18 @@ public class Explosion {
public Explosion(World world, Entity entity, double d0, double d1, double d2, float f) {
this.world = world;
this.source = entity;
- this.size = f;
+ this.size = (float) Math.max(f, 0.0); // CraftBukkit - clamp bad values
this.posX = d0;
this.posY = d1;
this.posZ = d2;
}
public void a() {
+ // CraftBukkit start
+ if (this.size < 0.1F) {
+ return;
+ }
+ // CraftBukkit end
float f = this.size;
byte b0 = 16;