Merge branch 'master' of github.com:iChun/MinecraftForge into miscchanges

This commit is contained in:
cpw 2013-07-27 22:57:44 +02:00
commit f5a8974bb6
2 changed files with 19 additions and 0 deletions

View file

@ -15,6 +15,16 @@ public abstract class RenderLivingEvent extends Event
this.entity = entity; this.entity = entity;
this.renderer = renderer; this.renderer = renderer;
} }
@Cancelable
public static class Pre extends RenderLivingEvent
{
public Pre(EntityLivingBase entity, RendererLivingEntity renderer){ super(entity, renderer); }
}
public static class Post extends RenderLivingEvent
{
public Post(EntityLivingBase entity, RendererLivingEntity renderer){ super(entity, renderer); }
}
public abstract static class Specials extends RenderLivingEvent public abstract static class Specials extends RenderLivingEvent
{ {

View file

@ -43,3 +43,12 @@
} }
protected boolean func_110813_b(EntityLivingBase par1EntityLivingBase) protected boolean func_110813_b(EntityLivingBase par1EntityLivingBase)
@@ -570,6 +578,8 @@
*/
public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9)
{
+ if (MinecraftForge.EVENT_BUS.post(new RenderLivingEvent.Pre((EntityLivingBase)par1Entity, this))) return;
this.func_130000_a((EntityLivingBase)par1Entity, par2, par4, par6, par8, par9);
+ MinecraftForge.EVENT_BUS.post(new RenderLivingEvent.Post((EntityLivingBase)par1Entity, this));
}
}