Fixed issue where Fire's 'fizz' would not play for the person who extinguished the fire.

This commit is contained in:
Lex Manos 2014-06-30 11:08:18 -07:00
parent 7525d209b6
commit 6db5d2ed26
2 changed files with 5 additions and 5 deletions

View file

@ -171,7 +171,7 @@
+ net.minecraftforge.client.event.EntityViewRenderEvent.FogColors event = new net.minecraftforge.client.event.EntityViewRenderEvent.FogColors(this, entitylivingbase, block, p_78466_1_, this.field_78518_n, this.field_78519_o, this.field_78533_p);
+ MinecraftForge.EVENT_BUS.post(event);
+
+
+ this.field_78518_n = event.red;
+ this.field_78533_p = event.blue;
+ this.field_78519_o = event.green;
@ -185,11 +185,11 @@
+ net.minecraftforge.client.event.EntityViewRenderEvent.FogDensity event = new net.minecraftforge.client.event.EntityViewRenderEvent.FogDensity(this, entitylivingbase, block, p_78468_2_, 0.1F);
+
+ if (MinecraftForge.EVENT_BUS.post(event))
+ if (MinecraftForge.EVENT_BUS.post(event))
+ {
+ GL11.glFogf(GL11.GL_FOG_DENSITY, event.density);
+ }
+ else
+ else
if (entitylivingbase.func_70644_a(Potion.field_76440_q))
{
f1 = 5.0F;

View file

@ -48,7 +48,7 @@
Block block = this.field_73092_a.func_147439_a(p_73074_1_, p_73074_2_, p_73074_3_);
- if (block.func_149688_o() != Material.field_151579_a)
+
+
+ if (!block.isAir(field_73092_a, p_73074_1_, p_73074_2_, p_73074_3_))
{
- block.func_149699_a(this.field_73092_a, p_73074_1_, p_73074_2_, p_73074_3_, this.field_73090_b);
@ -56,7 +56,7 @@
+ if (event.useBlock != Event.Result.DENY)
+ {
+ block.func_149699_a(field_73092_a, p_73074_1_, p_73074_2_, p_73074_3_, field_73090_b);
+ field_73092_a.func_72886_a(field_73090_b, p_73074_1_, p_73074_2_, p_73074_3_, p_73074_4_);
+ field_73092_a.func_72886_a(null, p_73074_1_, p_73074_2_, p_73074_3_, p_73074_4_);
+ }
+ else
+ {