Merge remote-tracking branch 'origin/master'

This commit is contained in:
Amnet 2013-04-10 08:09:59 +02:00
commit 0bc2d498f8
3 changed files with 1 additions and 5 deletions

View file

@ -27,7 +27,7 @@ public class ClientProxy extends CommonProxy {
RenderingRegistry.registerEntityRenderingHandler(EntityMudball.class, new RenderSnowball(BOPItems.mudBall));
}
@SideOnly(Side.CLIENT)
@Override
public void spawnMud(World world, double x, double y, double z, double xVel, double yVel, double zVel)
{
EntityFX entityfx = null;

View file

@ -20,7 +20,6 @@ public class CommonProxy {
return 0;
}
@SideOnly(Side.CLIENT)
public void spawnMud(World world, double x, double y, double z, double xVel, double yVel, double zVel)
{

View file

@ -39,13 +39,10 @@ public class EntityMudball extends EntityThrowable
((EntityLiving)par1MovingObjectPosition.entityHit).addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 300));
}
if (isClient)
{
for (int i = 0; i < 16; ++i)
{
mod_BiomesOPlenty.proxy.spawnMud(this.worldObj, this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D);
}
}
if (!this.worldObj.isRemote)
{